diff options
Diffstat (limited to 'src/ThemeBuilder/components/conditions')
10 files changed, 34 insertions, 34 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(); } }; |