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. --- include/cru/ui/style/Condition.h | 40 ++++++++++++++-------------- include/cru/ui/style/StyleRule.h | 18 ++++++------- include/cru/ui/style/Styler.h | 56 ++++++++++++++++++++-------------------- 3 files changed, 57 insertions(+), 57 deletions(-) (limited to 'include/cru/ui/style') diff --git a/include/cru/ui/style/Condition.h b/include/cru/ui/style/Condition.h index 2d2dceac..e9b0e9d5 100644 --- a/include/cru/ui/style/Condition.h +++ b/include/cru/ui/style/Condition.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "cru/base/Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/base/Event.h" #include "cru/ui/controls/IClickableControl.h" #include "cru/ui/helper/ClickDetector.h" @@ -23,8 +23,8 @@ class CRU_UI_API Condition : public Object { class CRU_UI_API NoCondition : public Condition { public: - static ClonablePtr Create() { - return ClonablePtr(new NoCondition); + static ClonePtr Create() { + return ClonePtr(new NoCondition); }; std::vector ChangeOn(controls::Control*) const override { @@ -38,23 +38,23 @@ class CRU_UI_API NoCondition : public Condition { class CRU_UI_API CompoundCondition : public Condition { public: - explicit CompoundCondition(std::vector> conditions); + explicit CompoundCondition(std::vector> conditions); std::vector ChangeOn(controls::Control* control) const override; - std::vector> GetChildren() const { + std::vector> GetChildren() const { return conditions_; } protected: - std::vector> conditions_; + std::vector> conditions_; }; class CRU_UI_API AndCondition : public CompoundCondition { public: - static ClonablePtr Create( - std::vector> conditions) { - return ClonablePtr(new AndCondition(std::move(conditions))); + static ClonePtr Create( + std::vector> conditions) { + return ClonePtr(new AndCondition(std::move(conditions))); } using CompoundCondition::CompoundCondition; @@ -66,9 +66,9 @@ class CRU_UI_API AndCondition : public CompoundCondition { class CRU_UI_API OrCondition : public CompoundCondition { public: - static ClonablePtr Create( - std::vector> conditions) { - return ClonablePtr(new OrCondition(std::move(conditions))); + static ClonePtr Create( + std::vector> conditions) { + return ClonePtr(new OrCondition(std::move(conditions))); } using CompoundCondition::CompoundCondition; @@ -80,8 +80,8 @@ class CRU_UI_API OrCondition : public CompoundCondition { class CRU_UI_API FocusCondition : public Condition { public: - static ClonablePtr Create(bool has_focus) { - return ClonablePtr(new FocusCondition(has_focus)); + static ClonePtr Create(bool has_focus) { + return ClonePtr(new FocusCondition(has_focus)); } explicit FocusCondition(bool has_focus); @@ -101,8 +101,8 @@ class CRU_UI_API FocusCondition : public Condition { class CRU_UI_API HoverCondition : public Condition { public: - static ClonablePtr Create(bool hover) { - return ClonablePtr(new HoverCondition(hover)); + static ClonePtr Create(bool hover) { + return ClonePtr(new HoverCondition(hover)); } explicit HoverCondition(bool hover) : hover_(hover) {} @@ -118,9 +118,9 @@ class CRU_UI_API HoverCondition : public Condition { class CRU_UI_API ClickStateCondition : public Condition { public: - static ClonablePtr Create( + static ClonePtr Create( helper::ClickState click_state) { - return ClonablePtr( + return ClonePtr( new ClickStateCondition(click_state)); } @@ -141,8 +141,8 @@ class CRU_UI_API ClickStateCondition : public Condition { class CRU_UI_API CheckedCondition : public Condition { public: - static ClonablePtr Create(bool checked) { - return ClonablePtr(new CheckedCondition(checked)); + static ClonePtr Create(bool checked) { + return ClonePtr(new CheckedCondition(checked)); } explicit CheckedCondition(bool checked); diff --git a/include/cru/ui/style/StyleRule.h b/include/cru/ui/style/StyleRule.h index 382cd664..dd0d8780 100644 --- a/include/cru/ui/style/StyleRule.h +++ b/include/cru/ui/style/StyleRule.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "Condition.h" #include "Styler.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" namespace cru::ui::style { /** @@ -11,14 +11,14 @@ namespace cru::ui::style { */ class CRU_UI_API StyleRule { public: - static ClonablePtr Create(ClonablePtr condition, - ClonablePtr styler, + static ClonePtr Create(ClonePtr condition, + ClonePtr styler, std::string name = {}) { - return ClonablePtr(new StyleRule( + return ClonePtr(new StyleRule( std::move(condition), std::move(styler), std::move(name))); } - StyleRule(ClonablePtr condition, ClonablePtr styler, + StyleRule(ClonePtr condition, ClonePtr styler, std::string name = {}); public: @@ -26,12 +26,12 @@ class CRU_UI_API StyleRule { Condition* GetCondition() const { return condition_.get(); } Styler* GetStyler() const { return styler_.get(); } - StyleRule WithNewCondition(ClonablePtr condition, + StyleRule WithNewCondition(ClonePtr condition, std::string name = {}) const { return StyleRule{std::move(condition), styler_, std::move(name)}; } - StyleRule WithNewStyler(ClonablePtr styler, + StyleRule WithNewStyler(ClonePtr styler, std::string name = {}) const { return StyleRule{condition_, std::move(styler), std::move(name)}; } @@ -39,8 +39,8 @@ class CRU_UI_API StyleRule { bool CheckAndApply(controls::Control* control) const; private: - ClonablePtr condition_; - ClonablePtr styler_; + ClonePtr condition_; + ClonePtr styler_; std::string name_; }; } // namespace cru::ui::style diff --git a/include/cru/ui/style/Styler.h b/include/cru/ui/style/Styler.h index 3ed85e1e..0e21945d 100644 --- a/include/cru/ui/style/Styler.h +++ b/include/cru/ui/style/Styler.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "ApplyBorderStyleInfo.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/gui/Cursor.h" #include "cru/ui/render/MeasureRequirement.h" @@ -12,7 +12,7 @@ namespace cru::ui::style { /** * \brief The base class for all styler implementations. - * \remarks Styler should be immutable. And we use cru::ClonablePtr to wrap it + * \remarks Styler should be immutable. And we use cru::ClonePtr to wrap it * in order to get both polymorphic and value semantics. */ class CRU_UI_API Styler : public Object { @@ -25,17 +25,17 @@ class CRU_UI_API Styler : public Object { class CRU_UI_API CompoundStyler : public Styler { public: template - static ClonablePtr Create(ClonablePtr... s) { - return ClonablePtr( - new CompoundStyler(std::vector>{std::move(s)...})); + static ClonePtr Create(ClonePtr... s) { + return ClonePtr( + new CompoundStyler(std::vector>{std::move(s)...})); } - static ClonablePtr Create( - std::vector> stylers) { - return ClonablePtr(new CompoundStyler(std::move(stylers))); + static ClonePtr Create( + std::vector> stylers) { + return ClonePtr(new CompoundStyler(std::move(stylers))); } - explicit CompoundStyler(std::vector> stylers) + explicit CompoundStyler(std::vector> stylers) : stylers_(std::move(stylers)) {} void Apply(controls::Control* control) const override { @@ -44,24 +44,24 @@ class CRU_UI_API CompoundStyler : public Styler { } } - std::vector> GetChildren() const { return stylers_; } + std::vector> GetChildren() const { return stylers_; } virtual CompoundStyler* Clone() const override { return new CompoundStyler(stylers_); } private: - std::vector> stylers_; + std::vector> stylers_; }; class CRU_UI_API BorderStyler : public Styler { public: - static ClonablePtr Create() { - return ClonablePtr(new BorderStyler()); + static ClonePtr Create() { + return ClonePtr(new BorderStyler()); } - static ClonablePtr Create(ApplyBorderStyleInfo style) { - return ClonablePtr(new BorderStyler(std::move(style))); + static ClonePtr Create(ApplyBorderStyleInfo style) { + return ClonePtr(new BorderStyler(std::move(style))); } BorderStyler() = default; @@ -79,12 +79,12 @@ class CRU_UI_API BorderStyler : public Styler { class CRU_UI_API CursorStyler : public Styler { public: - static ClonablePtr Create( + static ClonePtr Create( std::shared_ptr cursor) { - return ClonablePtr(new CursorStyler(std::move(cursor))); + return ClonePtr(new CursorStyler(std::move(cursor))); } - static ClonablePtr Create(platform::gui::SystemCursorType type); + static ClonePtr Create(platform::gui::SystemCursorType type); explicit CursorStyler(std::shared_ptr cursor) : cursor_(std::move(cursor)) {} @@ -101,8 +101,8 @@ class CRU_UI_API CursorStyler : public Styler { class CRU_UI_API PreferredSizeStyler : public Styler { public: - static ClonablePtr Create(render::MeasureSize size) { - return ClonablePtr(new PreferredSizeStyler(size)); + static ClonePtr Create(render::MeasureSize size) { + return ClonePtr(new PreferredSizeStyler(size)); } explicit PreferredSizeStyler(render::MeasureSize size) : size_(size) {} @@ -121,8 +121,8 @@ class CRU_UI_API PreferredSizeStyler : public Styler { class CRU_UI_API MarginStyler : public Styler { public: - static ClonablePtr Create(const Thickness& margin) { - return ClonablePtr(new MarginStyler(margin)); + static ClonePtr Create(const Thickness& margin) { + return ClonePtr(new MarginStyler(margin)); } explicit MarginStyler(const Thickness& margin) : margin_(margin) {} @@ -139,8 +139,8 @@ class CRU_UI_API MarginStyler : public Styler { class CRU_UI_API PaddingStyler : public Styler { public: - static ClonablePtr Create(const Thickness& padding) { - return ClonablePtr(new PaddingStyler(padding)); + static ClonePtr Create(const Thickness& padding) { + return ClonePtr(new PaddingStyler(padding)); } explicit PaddingStyler(const Thickness& padding) : padding_(padding) {} @@ -157,9 +157,9 @@ class CRU_UI_API PaddingStyler : public Styler { class CRU_UI_API ContentBrushStyler : public Styler { public: - static ClonablePtr Create( + static ClonePtr Create( std::shared_ptr brush) { - return ClonablePtr( + return ClonePtr( new ContentBrushStyler(std::move(brush))); } @@ -182,9 +182,9 @@ class CRU_UI_API ContentBrushStyler : public Styler { class CRU_UI_API FontStyler : public Styler { public: - static ClonablePtr Create( + static ClonePtr Create( std::shared_ptr font) { - return ClonablePtr(new FontStyler(std::move(font))); + return ClonePtr(new FontStyler(std::move(font))); } explicit FontStyler(std::shared_ptr font) -- cgit v1.2.3