From 4e0b7d82cd64ef8016dcb49247a8a5e4de8a0b3d Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Sun, 16 Nov 2025 10:37:36 +0800 Subject: Rename ClonePtr, update theme. --- src/ui/mapper/FontMapper.cpp | 2 +- src/ui/mapper/style/AndConditionMapper.cpp | 6 +++--- src/ui/mapper/style/BorderStylerMapper.cpp | 4 ++-- src/ui/mapper/style/CheckedConditionMapper.cpp | 4 ++-- src/ui/mapper/style/ClickStateConditionMapper.cpp | 4 ++-- src/ui/mapper/style/ContentBrushStylerMapper.cpp | 4 ++-- src/ui/mapper/style/CursorStylerMapper.cpp | 4 ++-- src/ui/mapper/style/FocusConditionMapper.cpp | 4 ++-- src/ui/mapper/style/FontStylerMapper.cpp | 4 ++-- src/ui/mapper/style/HoverConditionMapper.cpp | 4 ++-- src/ui/mapper/style/MarginStylerMapper.cpp | 2 +- src/ui/mapper/style/NoConditionMapper.cpp | 4 ++-- src/ui/mapper/style/OrConditionMapper.cpp | 6 +++--- src/ui/mapper/style/PaddingStylerMapper.cpp | 2 +- src/ui/mapper/style/PreferredSizeStylerMapper.cpp | 2 +- src/ui/mapper/style/StyleRuleMapper.cpp | 8 ++++---- src/ui/mapper/style/StyleRuleSetMapper.cpp | 2 +- src/ui/style/Condition.cpp | 4 ++-- src/ui/style/StyleRule.cpp | 4 ++-- src/ui/style/Styler.cpp | 4 ++-- 20 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/ui') 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 FontMapper::DoMapFromXml( auto font_family = font_family_attr.value_or(""); auto font_size = font_size_attr ? cru::string::ParseToNumber(*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 AndConditionMapper::DoMapFromXml( +ClonePtr AndConditionMapper::DoMapFromXml( xml::XmlElementNode *node) { - std::vector> conditions; + std::vector> conditions; auto condition_mappers = MapperRegistry::GetInstance()->GetMappersByInterface(); 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 BorderStylerMapper::DoMapFromXml( +ClonePtr BorderStylerMapper::DoMapFromXml( xml::XmlElementNode* node) { auto border_style_mapper = MapperRegistry::GetInstance()->GetMapper(); 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 CheckedConditionMapper::DoMapFromXml( +ClonePtr 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 +ClonePtr 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 +ClonePtr ContentBrushStylerMapper::DoMapFromXml(xml::XmlElementNode* node) { auto brush_mapper = MapperRegistry::GetInstance() ->GetSharedPtrMapper(); 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 CursorStylerMapper::DoMapFromXml( +ClonePtr CursorStylerMapper::DoMapFromXml( xml::XmlElementNode* node) { auto cursor_mapper = MapperRegistry::GetInstance()->GetSharedPtrMapper(); 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 FocusConditionMapper::DoMapFromXml( +ClonePtr 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 FontStylerMapper::DoMapFromXml( +ClonePtr FontStylerMapper::DoMapFromXml( xml::XmlElementNode* node) { auto font_mapper = MapperRegistry::GetInstance() ->GetSharedPtrMapper(); 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 HoverConditionMapper::DoMapFromXml( +ClonePtr 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 MarginStylerMapper::DoMapFromXml( +ClonePtr 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 NoConditionMapper::DoMapFromXml( +ClonePtr 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 OrConditionMapper::DoMapFromXml( +ClonePtr OrConditionMapper::DoMapFromXml( xml::XmlElementNode *node) { - std::vector> conditions; + std::vector> conditions; auto condition_mappers = MapperRegistry::GetInstance()->GetMappersByInterface(); 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 PaddingStylerMapper::DoMapFromXml( +ClonePtr 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 +ClonePtr 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 StyleRuleMapper::DoMapFromXml( +ClonePtr StyleRuleMapper::DoMapFromXml( xml::XmlElementNode* node) { std::vector condition_mappers = MapperRegistry::GetInstance()->GetMappersByInterface(); std::vector styler_mappers = MapperRegistry::GetInstance()->GetMappersByInterface(); - std::vector> conditions; - std::vector> stylers; + std::vector> conditions; + std::vector> 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 StyleRuleSetMapper::DoMapFromXml( xml::XmlElementNode* node) { auto style_rule_mapper = - MapperRegistry::GetInstance()->GetClonablePtrMapper(); + MapperRegistry::GetInstance()->GetClonePtrMapper(); auto result = std::make_shared(); 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 -#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> conditions) + std::vector> conditions) : conditions_(std::move(conditions)) {} std::vector 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, - ClonablePtr styler, std::string name) +StyleRule::StyleRule(ClonePtr condition, + ClonePtr 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::Create( +ClonePtr CursorStyler::Create( platform::gui::SystemCursorType type) { return Create(GetUiApplication()->GetCursorManager()->GetSystemCursor(type)); } -- cgit v1.2.3