diff options
Diffstat (limited to 'src/ThemeBuilder/components')
27 files changed, 75 insertions, 75 deletions
diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp index 04f2ed29..e207c761 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp @@ -1,5 +1,5 @@ #include "CheckedConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -14,7 +14,7 @@ CheckedConditionEditor::CheckedConditionEditor() { CheckedConditionEditor::~CheckedConditionEditor() {} -ClonablePtr<ui::style::CheckedCondition> CheckedConditionEditor::GetValue() +ClonePtr<ui::style::CheckedCondition> CheckedConditionEditor::GetValue() const { return ui::style::CheckedCondition::Create(checked_check_box_.GetValue()); } diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h index b6e740f1..c83a1cff 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -11,14 +11,14 @@ class CheckedConditionEditor : public ConditionEditor { ~CheckedConditionEditor() override; public: - ClonablePtr<ui::style::CheckedCondition> GetValue() const; + ClonePtr<ui::style::CheckedCondition> GetValue() const; void SetValue(ui::style::CheckedCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::CheckedCondition>& value, + void SetValue(const ClonePtr<ui::style::CheckedCondition>& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return GetValue(); } diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp index 57652ef6..24e83a0e 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp @@ -1,5 +1,5 @@ #include "ClickStateConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/helper/ClickDetector.h" #include "cru/ui/style/Condition.h" @@ -55,7 +55,7 @@ ClickStateConditionEditor::ClickStateConditionEditor() { ClickStateConditionEditor::~ClickStateConditionEditor() {} -ClonablePtr<ui::style::ClickStateCondition> +ClonePtr<ui::style::ClickStateCondition> ClickStateConditionEditor::GetValue() const { return ui::style::ClickStateCondition::Create( ConvertIndexToClickState(click_state_select_.GetSelectedIndex())); diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h index 2ea4fcf4..24d60f7b 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/SelectPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/base/Event.h" #include "cru/ui/style/Condition.h" @@ -12,15 +12,15 @@ class ClickStateConditionEditor : public ConditionEditor { ~ClickStateConditionEditor(); public: - ClonablePtr<ui::style::ClickStateCondition> GetValue() const; + ClonePtr<ui::style::ClickStateCondition> GetValue() const; void SetValue(ui::style::ClickStateCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::ClickStateCondition>& value, + void SetValue(const ClonePtr<ui::style::ClickStateCondition>& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return GetValue(); } diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp index a641c2df..d01ceca0 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp @@ -4,7 +4,7 @@ #include "ConditionEditor.h" #include "FocusConditionEditor.h" #include "NoConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/platform/Color.h" #include "cru/ui/Base.h" #include "cru/ui/ThemeManager.h" @@ -76,9 +76,9 @@ CompoundConditionEditor::CompoundConditionEditor() { CompoundConditionEditor::~CompoundConditionEditor() {} -std::vector<ClonablePtr<ui::style::Condition>> +std::vector<ClonePtr<ui::style::Condition>> CompoundConditionEditor::GetChildren() { - std::vector<ClonablePtr<ui::style::Condition>> children; + std::vector<ClonePtr<ui::style::Condition>> children; for (auto& child : children_) { children.push_back(child->GetCondition()); } @@ -86,7 +86,7 @@ CompoundConditionEditor::GetChildren() { } void CompoundConditionEditor::SetChildren( - std::vector<ClonablePtr<ui::style::Condition>> children, + std::vector<ClonePtr<ui::style::Condition>> children, bool trigger_change) { children_container_.ClearChildren(); children_.clear(); diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h index 2948df36..af632758 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h @@ -1,6 +1,6 @@ #pragma once #include "ConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/base/Event.h" #include "cru/ui/components/Component.h" #include "cru/ui/components/PopupButton.h" @@ -16,8 +16,8 @@ class CompoundConditionEditor : public ConditionEditor { ~CompoundConditionEditor(); protected: - std::vector<ClonablePtr<ui::style::Condition>> GetChildren(); - void SetChildren(std::vector<ClonablePtr<ui::style::Condition>> children, + std::vector<ClonePtr<ui::style::Condition>> GetChildren(); + void SetChildren(std::vector<ClonePtr<ui::style::Condition>> children, bool trigger_change = true); private: @@ -32,18 +32,18 @@ class AndConditionEditor : public CompoundConditionEditor { ~AndConditionEditor() override = default; public: - ClonablePtr<ui::style::AndCondition> GetValue() { + ClonePtr<ui::style::AndCondition> GetValue() { return ui::style::AndCondition::Create(GetChildren()); } void SetValue(ui::style::AndCondition* value, bool trigger_change = true) { SetChildren(value->GetChildren(), trigger_change); } - void SetValue(const ClonablePtr<ui::style::AndCondition>& value, + void SetValue(const ClonePtr<ui::style::AndCondition>& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return GetValue(); } }; @@ -54,18 +54,18 @@ class OrConditionEditor : public CompoundConditionEditor { ~OrConditionEditor() override = default; public: - ClonablePtr<ui::style::OrCondition> GetValue() { + ClonePtr<ui::style::OrCondition> GetValue() { return ui::style::OrCondition::Create(GetChildren()); } void SetValue(ui::style::OrCondition* value, bool trigger_change = true) { SetChildren(value->GetChildren(), trigger_change); } - void SetValue(const ClonablePtr<ui::style::OrCondition>& value, + void SetValue(const ClonePtr<ui::style::OrCondition>& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return GetValue(); } }; diff --git a/src/ThemeBuilder/components/conditions/ConditionEditor.h b/src/ThemeBuilder/components/conditions/ConditionEditor.h index f20132f6..ca632cc0 100644 --- a/src/ThemeBuilder/components/conditions/ConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/ConditionEditor.h @@ -9,7 +9,7 @@ class ConditionEditor : public HeadBodyEditor { ~ConditionEditor() override; public: - virtual ClonablePtr<ui::style::Condition> GetCondition() = 0; + virtual ClonePtr<ui::style::Condition> GetCondition() = 0; }; std::unique_ptr<ConditionEditor> CreateConditionEditor( diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp index 0ac3e224..67a660d1 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp @@ -1,5 +1,5 @@ #include "FocusConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -14,7 +14,7 @@ FocusConditionEditor::FocusConditionEditor() { FocusConditionEditor::~FocusConditionEditor() {} -ClonablePtr<ui::style::FocusCondition> FocusConditionEditor::GetValue() const { +ClonePtr<ui::style::FocusCondition> FocusConditionEditor::GetValue() const { return ui::style::FocusCondition::Create(focus_check_box_.GetValue()); } diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h index d5478653..c9c8018e 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -11,14 +11,14 @@ class FocusConditionEditor : public ConditionEditor { ~FocusConditionEditor() override; public: - ClonablePtr<ui::style::FocusCondition> GetValue() const; + ClonePtr<ui::style::FocusCondition> GetValue() const; void SetValue(ui::style::FocusCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::FocusCondition>& value, + void SetValue(const ClonePtr<ui::style::FocusCondition>& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return GetValue(); } diff --git a/src/ThemeBuilder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h index b38806b5..1cb50947 100644 --- a/src/ThemeBuilder/components/conditions/NoConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h @@ -1,6 +1,6 @@ #pragma once #include "ConditionEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -10,7 +10,7 @@ class NoConditionEditor : public ConditionEditor { ~NoConditionEditor() override; public: - ClonablePtr<ui::style::Condition> GetCondition() override { + ClonePtr<ui::style::Condition> GetCondition() override { return ui::style::NoCondition::Create(); } }; diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp index c44b4723..74ce83ec 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp @@ -1,5 +1,5 @@ #include "BorderStylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/gui/UiApplication.h" @@ -29,7 +29,7 @@ BorderStylerEditor::BorderStylerEditor() { BorderStylerEditor::~BorderStylerEditor() {} -ClonablePtr<ui::style::BorderStyler> BorderStylerEditor::GetValue() { +ClonePtr<ui::style::BorderStyler> BorderStylerEditor::GetValue() { auto graphics_factory = platform::gui::IUiApplication::GetInstance()->GetGraphicsFactory(); diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h index c9435ee9..ea92a8d4 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h @@ -4,7 +4,7 @@ #include "../properties/OptionalPropertyEditor.h" #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" namespace cru::theme_builder::components::stylers { class BorderStylerEditor : public StylerEditor { @@ -12,14 +12,14 @@ class BorderStylerEditor : public StylerEditor { BorderStylerEditor(); ~BorderStylerEditor() override; - ClonablePtr<ui::style::BorderStyler> GetValue(); + ClonePtr<ui::style::BorderStyler> GetValue(); void SetValue(ui::style::BorderStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::BorderStyler>& styler, + void SetValue(const ClonePtr<ui::style::BorderStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::OptionalPropertyEditor<properties::CornerRadiusPropertyEditor> diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp index af22217b..15f4e912 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp @@ -6,7 +6,7 @@ #include "MarginStylerEditor.h" #include "PaddingStylerEditor.h" #include "PreferredSizeStylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/style/Styler.h" @@ -78,8 +78,8 @@ CompoundStylerEditor::CompoundStylerEditor() { CompoundStylerEditor::~CompoundStylerEditor() {} -ClonablePtr<ui::style::CompoundStyler> CompoundStylerEditor::GetValue() { - std::vector<ClonablePtr<ui::style::Styler>> children_styler; +ClonePtr<ui::style::CompoundStyler> CompoundStylerEditor::GetValue() { + std::vector<ClonePtr<ui::style::Styler>> children_styler; for (auto& child : children_) { children_styler.push_back(child->GetStyler()); } diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h index 91d2bff5..f9265fbf 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h @@ -1,6 +1,6 @@ #pragma once #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/DeleteLater.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/FlexLayout.h" @@ -13,14 +13,14 @@ class CompoundStylerEditor : public StylerEditor { ~CompoundStylerEditor() override; public: - ClonablePtr<ui::style::CompoundStyler> GetValue(); + ClonePtr<ui::style::CompoundStyler> GetValue(); void SetValue(ui::style::CompoundStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::CompoundStyler>& styler, + void SetValue(const ClonePtr<ui::style::CompoundStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: ui::controls::FlexLayout children_container_; diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp index bd649c67..00b40d10 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp @@ -12,7 +12,7 @@ ContentBrushStylerEditor::ContentBrushStylerEditor() { ContentBrushStylerEditor::~ContentBrushStylerEditor() {} -ClonablePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue() +ClonePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue() const { return ui::style::ContentBrushStyler::Create( platform::gui::IUiApplication::GetInstance() diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h index ec51c041..91e8adc2 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/ColorPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -12,11 +12,11 @@ class ContentBrushStylerEditor : public StylerEditor { ~ContentBrushStylerEditor(); public: - ClonablePtr<ui::style::ContentBrushStyler> GetValue() const; + ClonePtr<ui::style::ContentBrushStyler> GetValue() const; void SetValue(ui::style::ContentBrushStyler* value, bool trigger_change = true); - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::ColorPropertyEditor color_editor_; diff --git a/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp index 71de739a..589efc2b 100644 --- a/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp @@ -16,7 +16,7 @@ CursorStylerEditor::CursorStylerEditor() { CursorStylerEditor::~CursorStylerEditor() {} -ClonablePtr<ui::style::CursorStyler> CursorStylerEditor::GetValue() { +ClonePtr<ui::style::CursorStyler> CursorStylerEditor::GetValue() { auto cursor_manager = platform::gui::IUiApplication::GetInstance()->GetCursorManager(); diff --git a/src/ThemeBuilder/components/stylers/CursorStylerEditor.h b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h index 552619a0..a40c8aa9 100644 --- a/src/ThemeBuilder/components/stylers/CursorStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h @@ -9,14 +9,14 @@ class CursorStylerEditor : public StylerEditor { ~CursorStylerEditor() override; public: - ClonablePtr<ui::style::CursorStyler> GetValue(); + ClonePtr<ui::style::CursorStyler> GetValue(); void SetValue(ui::style::CursorStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::CursorStyler>& styler, + void SetValue(const ClonePtr<ui::style::CursorStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::SelectPropertyEditor cursor_select_; diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp index 9787a4fd..c8687e6d 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp @@ -12,7 +12,7 @@ FontStylerEditor::FontStylerEditor() { FontStylerEditor::~FontStylerEditor() {} -ClonablePtr<ui::style::FontStyler> FontStylerEditor::GetValue() const { +ClonePtr<ui::style::FontStyler> FontStylerEditor::GetValue() const { return ui::style::FontStyler::Create(font_editor_.GetValue()); } diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h index 847b0e2a..a5145e31 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/FontPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -12,10 +12,10 @@ class FontStylerEditor : public StylerEditor { ~FontStylerEditor(); public: - ClonablePtr<ui::style::FontStyler> GetValue() const; + ClonePtr<ui::style::FontStyler> GetValue() const; void SetValue(ui::style::FontStyler* value, bool trigger_change = true); - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::FontPropertyEditor font_editor_; diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp index c750e9b6..bfd15903 100644 --- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp @@ -13,7 +13,7 @@ MarginStylerEditor::MarginStylerEditor() { MarginStylerEditor::~MarginStylerEditor() {} -ClonablePtr<ui::style::MarginStyler> MarginStylerEditor::GetValue() { +ClonePtr<ui::style::MarginStyler> MarginStylerEditor::GetValue() { return ui::style::MarginStyler::Create(thickness_editor_.GetValue()); } diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h index 9a1ca750..e27bf61e 100644 --- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -10,14 +10,14 @@ class MarginStylerEditor : public StylerEditor { MarginStylerEditor(); ~MarginStylerEditor() override; - ClonablePtr<ui::style::MarginStyler> GetValue(); + ClonePtr<ui::style::MarginStyler> GetValue(); void SetValue(ui::style::MarginStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::MarginStyler>& styler, + void SetValue(const ClonePtr<ui::style::MarginStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::ThicknessPropertyEditor thickness_editor_; diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp index 5cf9d3d8..1ad6cf35 100644 --- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp @@ -13,7 +13,7 @@ PaddingStylerEditor::PaddingStylerEditor() { PaddingStylerEditor::~PaddingStylerEditor() {} -ClonablePtr<ui::style::PaddingStyler> PaddingStylerEditor::GetValue() { +ClonePtr<ui::style::PaddingStyler> PaddingStylerEditor::GetValue() { return ui::style::PaddingStyler::Create(thickness_editor_.GetValue()); } diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h index 69565cad..e11918f8 100644 --- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -10,14 +10,14 @@ class PaddingStylerEditor : public StylerEditor { PaddingStylerEditor(); ~PaddingStylerEditor() override; - ClonablePtr<ui::style::PaddingStyler> GetValue(); + ClonePtr<ui::style::PaddingStyler> GetValue(); void SetValue(ui::style::PaddingStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::PaddingStyler>& styler, + void SetValue(const ClonePtr<ui::style::PaddingStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::ThicknessPropertyEditor thickness_editor_; diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp index f0e700a1..8c7c751f 100644 --- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp @@ -16,7 +16,7 @@ PreferredSizeStylerEditor::PreferredSizeStylerEditor() { PreferredSizeStylerEditor::~PreferredSizeStylerEditor() {} -ClonablePtr<ui::style::PreferredSizeStyler> +ClonePtr<ui::style::PreferredSizeStyler> PreferredSizeStylerEditor::GetValue() { return ui::style::PreferredSizeStyler::Create(ui::render::MeasureSize{ width_editor_.GetValue(), height_editor_.GetValue()}); diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h index 36fdc3d6..2c83b533 100644 --- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/MeasureLengthPropertyEditor.h" #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -10,15 +10,15 @@ class PreferredSizeStylerEditor : public StylerEditor { PreferredSizeStylerEditor(); ~PreferredSizeStylerEditor() override; - ClonablePtr<ui::style::PreferredSizeStyler> GetValue(); + ClonePtr<ui::style::PreferredSizeStyler> GetValue(); void SetValue(ui::style::PreferredSizeStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr<ui::style::PreferredSizeStyler>& styler, + void SetValue(const ClonePtr<ui::style::PreferredSizeStyler>& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); } + ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); } private: properties::MeasureLengthPropertyEditor width_editor_; diff --git a/src/ThemeBuilder/components/stylers/StylerEditor.h b/src/ThemeBuilder/components/stylers/StylerEditor.h index 8aa52bda..8bd6af48 100644 --- a/src/ThemeBuilder/components/stylers/StylerEditor.h +++ b/src/ThemeBuilder/components/stylers/StylerEditor.h @@ -9,7 +9,7 @@ class StylerEditor : public HeadBodyEditor { ~StylerEditor() override; public: - virtual ClonablePtr<ui::style::Styler> GetStyler() = 0; + virtual ClonePtr<ui::style::Styler> GetStyler() = 0; }; std::unique_ptr<StylerEditor> CreateStylerEditor(ui::style::Styler* styler); |