aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/mapper/FontMapper.cpp2
-rw-r--r--src/ui/mapper/style/AndConditionMapper.cpp6
-rw-r--r--src/ui/mapper/style/BorderStylerMapper.cpp4
-rw-r--r--src/ui/mapper/style/CheckedConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/ClickStateConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/ContentBrushStylerMapper.cpp4
-rw-r--r--src/ui/mapper/style/CursorStylerMapper.cpp4
-rw-r--r--src/ui/mapper/style/FocusConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/FontStylerMapper.cpp4
-rw-r--r--src/ui/mapper/style/HoverConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/MarginStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/NoConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/OrConditionMapper.cpp6
-rw-r--r--src/ui/mapper/style/PaddingStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/PreferredSizeStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/StyleRuleMapper.cpp8
-rw-r--r--src/ui/mapper/style/StyleRuleSetMapper.cpp2
-rw-r--r--src/ui/style/Condition.cpp4
-rw-r--r--src/ui/style/StyleRule.cpp4
-rw-r--r--src/ui/style/Styler.cpp4
20 files changed, 39 insertions, 39 deletions
diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp
index ebf7c27c..6ba37964 100644
--- a/src/ui/mapper/FontMapper.cpp
+++ b/src/ui/mapper/FontMapper.cpp
@@ -16,7 +16,7 @@ std::shared_ptr<platform::graphics::IFont> FontMapper::DoMapFromXml(
auto font_family = font_family_attr.value_or("");
auto font_size =
font_size_attr ? cru::string::ParseToNumber<float>(*font_size_attr).value
- : 24.0f;
+ : 16.0f;
return GetGraphicsFactory()->CreateFont(font_family, font_size);
}
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index 0b1fc008..ad996a4e 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/AndConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/style/Condition.h"
@@ -10,9 +10,9 @@ bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "AndCondition") == 0;
}
-ClonablePtr<ui::style::AndCondition> AndConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::AndCondition> AndConditionMapper::DoMapFromXml(
xml::XmlElementNode *node) {
- std::vector<ClonablePtr<ui::style::Condition>> conditions;
+ std::vector<ClonePtr<ui::style::Condition>> conditions;
auto condition_mappers =
MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
for (auto child : node->GetChildren()) {
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index 3deeed43..33358b28 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/BorderStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/ApplyBorderStyleInfo.h"
#include "cru/ui/style/Styler.h"
@@ -13,7 +13,7 @@ bool BorderStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "BorderStyler") == 0;
}
-ClonablePtr<BorderStyler> BorderStylerMapper::DoMapFromXml(
+ClonePtr<BorderStyler> BorderStylerMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto border_style_mapper =
MapperRegistry::GetInstance()->GetMapper<ApplyBorderStyleInfo>();
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index 2d01b4bf..9e93cbea 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/CheckedConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
#include "cru/base/xml/XmlNode.h"
@@ -10,7 +10,7 @@ bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
"CheckedCondition") == 0;
}
-ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto value = node->GetAttributeValueCaseInsensitive("value");
if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index 16ef1209..accfdf0a 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/ClickStateConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/StringUtil.h"
#include "cru/ui/helper/ClickDetector.h"
#include "cru/ui/style/Condition.h"
@@ -11,7 +11,7 @@ bool ClickStateConditionMapper::XmlElementIsOfThisType(
"ClickStateCondition") == 0;
}
-ClonablePtr<ui::style::ClickStateCondition>
+ClonePtr<ui::style::ClickStateCondition>
ClickStateConditionMapper::DoMapFromXml(xml::XmlElementNode *node) {
auto state = helper::ClickState::None;
auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
index c5caab02..1ab91be0 100644
--- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp
+++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/ContentBrushStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/platform/graphics/Brush.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/Styler.h"
@@ -12,7 +12,7 @@ ContentBrushStylerMapper::ContentBrushStylerMapper() {
ContentBrushStylerMapper::~ContentBrushStylerMapper() {}
-ClonablePtr<ui::style::ContentBrushStyler>
+ClonePtr<ui::style::ContentBrushStyler>
ContentBrushStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
auto brush_mapper = MapperRegistry::GetInstance()
->GetSharedPtrMapper<platform::graphics::IBrush>();
diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp
index c9a75329..e5051ce0 100644
--- a/src/ui/mapper/style/CursorStylerMapper.cpp
+++ b/src/ui/mapper/style/CursorStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/CursorStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/Styler.h"
@@ -9,7 +9,7 @@ bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "CursorStyler") == 0;
}
-ClonablePtr<ui::style::CursorStyler> CursorStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::CursorStyler> CursorStylerMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto cursor_mapper =
MapperRegistry::GetInstance()->GetSharedPtrMapper<platform::gui::ICursor>();
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index 26a5780d..08d0c992 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/FocusConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
#include "cru/base/xml/XmlNode.h"
@@ -10,7 +10,7 @@ bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
"FocusCondition") == 0;
}
-ClonablePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto value = node->GetAttributeValueCaseInsensitive("value");
if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/FontStylerMapper.cpp b/src/ui/mapper/style/FontStylerMapper.cpp
index 1555c071..ac8051a3 100644
--- a/src/ui/mapper/style/FontStylerMapper.cpp
+++ b/src/ui/mapper/style/FontStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/FontStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
namespace cru::ui::mapper::style {
@@ -7,7 +7,7 @@ FontStylerMapper::FontStylerMapper() { SetAllowedTags({"FontStyler"}); }
FontStylerMapper::~FontStylerMapper() {}
-ClonablePtr<ui::style::FontStyler> FontStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::FontStyler> FontStylerMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto font_mapper = MapperRegistry::GetInstance()
->GetSharedPtrMapper<platform::graphics::IFont>();
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 1a7ffd95..7797ad7c 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/HoverConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
@@ -11,7 +11,7 @@ bool HoverConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
"HoverCondition") == 0;
}
-ClonablePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
+ClonePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto value = node->GetAttributeValueCaseInsensitive("value");
if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/MarginStylerMapper.cpp b/src/ui/mapper/style/MarginStylerMapper.cpp
index ffbdcd75..2343dd3e 100644
--- a/src/ui/mapper/style/MarginStylerMapper.cpp
+++ b/src/ui/mapper/style/MarginStylerMapper.cpp
@@ -8,7 +8,7 @@ MarginStylerMapper::MarginStylerMapper() { SetAllowedTags({"MarginStyler"}); }
MarginStylerMapper::~MarginStylerMapper() {}
-ClonablePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
xml::XmlElementNode* node) {
Thickness thickness;
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index 84cbf598..3ee9981e 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/NoConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/xml/XmlNode.h"
namespace cru::ui::mapper::style {
@@ -7,7 +7,7 @@ bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "NoCondition") == 0;
}
-ClonablePtr<ui::style::NoCondition> NoConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::NoCondition> NoConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
return ui::style::NoCondition::Create();
}
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 98b4078d..5591bab0 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/OrConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/style/Condition.h"
@@ -10,9 +10,9 @@ bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "OrCondition") == 0;
}
-ClonablePtr<ui::style::OrCondition> OrConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::OrCondition> OrConditionMapper::DoMapFromXml(
xml::XmlElementNode *node) {
- std::vector<ClonablePtr<ui::style::Condition>> conditions;
+ std::vector<ClonePtr<ui::style::Condition>> conditions;
auto condition_mappers =
MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
for (auto child : node->GetChildren()) {
diff --git a/src/ui/mapper/style/PaddingStylerMapper.cpp b/src/ui/mapper/style/PaddingStylerMapper.cpp
index faa86082..60c40c3d 100644
--- a/src/ui/mapper/style/PaddingStylerMapper.cpp
+++ b/src/ui/mapper/style/PaddingStylerMapper.cpp
@@ -10,7 +10,7 @@ PaddingStylerMapper::PaddingStylerMapper() {
PaddingStylerMapper::~PaddingStylerMapper() {}
-ClonablePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
xml::XmlElementNode* node) {
Thickness thickness;
diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
index 2fe71025..0603f5c4 100644
--- a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
+++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
@@ -9,7 +9,7 @@ bool PreferredSizeStylerMapper::XmlElementIsOfThisType(
return cru::string::CaseInsensitiveCompare(node->GetTag(), "PreferredSizeStyler") == 0;
}
-ClonablePtr<ui::style::PreferredSizeStyler>
+ClonePtr<ui::style::PreferredSizeStyler>
PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
render::MeasureSize size;
diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp
index f14d11da..30fedb16 100644
--- a/src/ui/mapper/style/StyleRuleMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/StyleRuleMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/mapper/style/IStylerMapper.h"
@@ -13,15 +13,15 @@ bool StyleRuleMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return cru::string::CaseInsensitiveCompare(node->GetTag(), "StyleRule") == 0;
}
-ClonablePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
+ClonePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
xml::XmlElementNode* node) {
std::vector<IConditionMapper*> condition_mappers =
MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
std::vector<IStylerMapper*> styler_mappers =
MapperRegistry::GetInstance()->GetMappersByInterface<IStylerMapper>();
- std::vector<ClonablePtr<Condition>> conditions;
- std::vector<ClonablePtr<Styler>> stylers;
+ std::vector<ClonePtr<Condition>> conditions;
+ std::vector<ClonePtr<Styler>> stylers;
for (auto child : node->GetChildren()) {
if (child->GetType() == xml::XmlNode::Type::Element) {
diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp
index d4bc7c37..19a628ad 100644
--- a/src/ui/mapper/style/StyleRuleSetMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp
@@ -14,7 +14,7 @@ bool StyleRuleSetMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
std::shared_ptr<ui::style::StyleRuleSet> StyleRuleSetMapper::DoMapFromXml(
xml::XmlElementNode* node) {
auto style_rule_mapper =
- MapperRegistry::GetInstance()->GetClonablePtrMapper<StyleRule>();
+ MapperRegistry::GetInstance()->GetClonePtrMapper<StyleRule>();
auto result = std::make_shared<StyleRuleSet>();
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp
index a0de03dc..abe52edb 100644
--- a/src/ui/style/Condition.cpp
+++ b/src/ui/style/Condition.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/style/Condition.h"
#include <memory>
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/base/Event.h"
#include "cru/ui/controls/Control.h"
#include "cru/ui/controls/ICheckableControl.h"
@@ -10,7 +10,7 @@
namespace cru::ui::style {
CompoundCondition::CompoundCondition(
- std::vector<ClonablePtr<Condition>> conditions)
+ std::vector<ClonePtr<Condition>> conditions)
: conditions_(std::move(conditions)) {}
std::vector<IBaseEvent*> CompoundCondition::ChangeOn(
diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp
index 8b9b0a56..bdd0acf2 100644
--- a/src/ui/style/StyleRule.cpp
+++ b/src/ui/style/StyleRule.cpp
@@ -1,8 +1,8 @@
#include "cru/ui/style/StyleRule.h"
namespace cru::ui::style {
-StyleRule::StyleRule(ClonablePtr<Condition> condition,
- ClonablePtr<Styler> styler, std::string name)
+StyleRule::StyleRule(ClonePtr<Condition> condition,
+ ClonePtr<Styler> styler, std::string name)
: condition_(std::move(condition)),
styler_(std::move(styler)),
name_(std::move(name)) {}
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
index a4e3ac25..8b4405cd 100644
--- a/src/ui/style/Styler.cpp
+++ b/src/ui/style/Styler.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/style/Styler.h"
#include "../Helper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/platform/gui/UiApplication.h"
#include "cru/ui/controls/Control.h"
@@ -20,7 +20,7 @@ void BorderStyler::Apply(controls::Control *control) const {
}
}
-ClonablePtr<CursorStyler> CursorStyler::Create(
+ClonePtr<CursorStyler> CursorStyler::Create(
platform::gui::SystemCursorType type) {
return Create(GetUiApplication()->GetCursorManager()->GetSystemCursor(type));
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-24 16:43:58 +0000