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. --- assets/cru/ui/DefaultResources.xml | 5 + include/cru/base/ClonablePtr.h | 216 --------------------- include/cru/base/ClonePtr.h | 119 ++++++++++++ include/cru/ui/mapper/Mapper.h | 4 +- include/cru/ui/mapper/MapperRegistry.h | 4 +- include/cru/ui/mapper/style/AndConditionMapper.h | 6 +- include/cru/ui/mapper/style/BorderStylerMapper.h | 8 +- .../cru/ui/mapper/style/CheckedConditionMapper.h | 6 +- .../ui/mapper/style/ClickStateConditionMapper.h | 6 +- .../cru/ui/mapper/style/ContentBrushStylerMapper.h | 6 +- include/cru/ui/mapper/style/CursorStylerMapper.h | 6 +- include/cru/ui/mapper/style/FocusConditionMapper.h | 6 +- include/cru/ui/mapper/style/FontStylerMapper.h | 6 +- include/cru/ui/mapper/style/HoverConditionMapper.h | 6 +- include/cru/ui/mapper/style/IConditionMapper.h | 4 +- include/cru/ui/mapper/style/IStylerMapper.h | 4 +- include/cru/ui/mapper/style/MarginStylerMapper.h | 6 +- include/cru/ui/mapper/style/NoConditionMapper.h | 8 +- include/cru/ui/mapper/style/OrConditionMapper.h | 6 +- include/cru/ui/mapper/style/PaddingStylerMapper.h | 6 +- .../ui/mapper/style/PreferredSizeStylerMapper.h | 6 +- include/cru/ui/mapper/style/StyleRuleMapper.h | 6 +- include/cru/ui/style/Condition.h | 40 ++-- include/cru/ui/style/StyleRule.h | 18 +- include/cru/ui/style/Styler.h | 56 +++--- .../conditions/CheckedConditionEditor.cpp | 4 +- .../components/conditions/CheckedConditionEditor.h | 8 +- .../conditions/ClickStateConditionEditor.cpp | 4 +- .../conditions/ClickStateConditionEditor.h | 8 +- .../conditions/CompoundConditionEditor.cpp | 8 +- .../conditions/CompoundConditionEditor.h | 18 +- .../components/conditions/ConditionEditor.h | 2 +- .../components/conditions/FocusConditionEditor.cpp | 4 +- .../components/conditions/FocusConditionEditor.h | 8 +- .../components/conditions/NoConditionEditor.h | 4 +- .../components/stylers/BorderStylerEditor.cpp | 4 +- .../components/stylers/BorderStylerEditor.h | 8 +- .../components/stylers/CompoundStylerEditor.cpp | 6 +- .../components/stylers/CompoundStylerEditor.h | 8 +- .../stylers/ContentBrushStylerEditor.cpp | 2 +- .../components/stylers/ContentBrushStylerEditor.h | 6 +- .../components/stylers/CursorStylerEditor.cpp | 2 +- .../components/stylers/CursorStylerEditor.h | 6 +- .../components/stylers/FontStylerEditor.cpp | 2 +- .../components/stylers/FontStylerEditor.h | 6 +- .../components/stylers/MarginStylerEditor.cpp | 2 +- .../components/stylers/MarginStylerEditor.h | 8 +- .../components/stylers/PaddingStylerEditor.cpp | 2 +- .../components/stylers/PaddingStylerEditor.h | 8 +- .../stylers/PreferredSizeStylerEditor.cpp | 2 +- .../components/stylers/PreferredSizeStylerEditor.h | 8 +- src/ThemeBuilder/components/stylers/StylerEditor.h | 2 +- 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 +- 72 files changed, 350 insertions(+), 442 deletions(-) delete mode 100644 include/cru/base/ClonablePtr.h create mode 100644 include/cru/base/ClonePtr.h diff --git a/assets/cru/ui/DefaultResources.xml b/assets/cru/ui/DefaultResources.xml index f7c1366d..5512dce6 100644 --- a/assets/cru/ui/DefaultResources.xml +++ b/assets/cru/ui/DefaultResources.xml @@ -79,6 +79,7 @@ + @@ -91,6 +92,7 @@ + @@ -102,6 +104,7 @@ + @@ -113,6 +116,7 @@ + @@ -124,6 +128,7 @@ + diff --git a/include/cru/base/ClonablePtr.h b/include/cru/base/ClonablePtr.h deleted file mode 100644 index 1198315f..00000000 --- a/include/cru/base/ClonablePtr.h +++ /dev/null @@ -1,216 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace cru { -template -class ClonablePtr { - template - friend class ClonablePtr; - - public: - using element_type = typename std::unique_ptr::element_type; - using pointer = typename std::unique_ptr::pointer; - - ClonablePtr() = default; - ClonablePtr(std::nullptr_t) noexcept : ptr_(nullptr) {} - explicit ClonablePtr(pointer p) noexcept : ptr_(p) {} - ClonablePtr(std::unique_ptr&& p) noexcept - : ptr_(std::move(p)) {} - template ::pointer, pointer>, - int> = 0> - ClonablePtr(std::unique_ptr&& p) : ptr_(std::move(p)) {} - ClonablePtr(const ClonablePtr& other) : ptr_(other.ptr_->Clone()) {} - ClonablePtr(ClonablePtr&& other) = default; - template ::pointer, pointer>, - int> = 0> - ClonablePtr(const ClonablePtr& other) : ptr_(other.ptr_->Clone()) {} - template ::pointer, pointer>, - int> = 0> - ClonablePtr(ClonablePtr&& other) noexcept : ptr_(std::move(other.ptr_)) {} - ClonablePtr& operator=(std::nullptr_t) noexcept { - ptr_ = nullptr; - return *this; - } - ClonablePtr& operator=(std::unique_ptr&& other) noexcept { - ptr_ = std::move(other); - return *this; - } - template ::pointer, pointer>, - int> = 0> - ClonablePtr& operator=(std::unique_ptr&& p) noexcept { - ptr_ = std::move(p); - return *this; - } - ClonablePtr& operator=(const ClonablePtr& other) { - if (this != &other) { - ptr_ = std::unique_ptr(other.ptr_->Clone()); - } - return *this; - } - ClonablePtr& operator=(ClonablePtr&& other) = default; - template ::pointer, pointer>, - int> = 0> - ClonablePtr& operator=(const ClonablePtr& other) noexcept { - if (this != &other) { - ptr_ = std::unique_ptr(other.ptr_->Clone()); - } - return *this; - } - template ::pointer, pointer>, - int> = 0> - ClonablePtr& operator=(ClonablePtr&& other) noexcept { - ptr_ = std::move(other.ptr_); - } - - ~ClonablePtr() = default; - - public: - pointer release() noexcept { return ptr_.release(); } - void reset(pointer p = pointer()) noexcept { ptr_.reset(p); } - void swap(ClonablePtr& other) noexcept { ptr_.swap(other.ptr_); } - - public: - pointer get() const noexcept { return ptr_.get(); } - - operator bool() const noexcept { return ptr_ != nullptr; } - - element_type& operator*() const noexcept { return *ptr_; } - pointer operator->() const noexcept { return ptr_.get(); } - - int Compare(const ClonablePtr& other) const noexcept { - if (ptr_ == other.ptr_) { - return 0; - } else if (ptr_ < other.ptr_) { - return -1; - } else { - return 1; - } - } - - int Compare(std::nullptr_t) const noexcept { return ptr_ ? 1 : 0; } - - private: - std::unique_ptr ptr_; -}; - -template -void swap(ClonablePtr& left, ClonablePtr& right) noexcept { - left.swap(right); -} - -template -bool operator==(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) == 0; -} - -template -bool operator!=(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) != 0; -} - -template -bool operator<(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) < 0; -} - -template -bool operator<=(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) <= 0; -} - -template -bool operator>(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) > 0; -} - -template -bool operator>=(const ClonablePtr& left, const ClonablePtr& right) { - return left.Compare(right) >= 0; -} - -template -bool operator==(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) == 0; -} - -template -bool operator!=(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) != 0; -} - -template -bool operator<(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) < 0; -} - -template -bool operator<=(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) <= 0; -} - -template -bool operator>(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) > 0; -} - -template -bool operator>=(const ClonablePtr& left, std::nullptr_t) { - return left.Compare(nullptr) >= 0; -} - -template -bool operator==(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) == 0; -} - -template -bool operator!=(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) != 0; -} - -template -bool operator<(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) > 0; -} - -template -bool operator<=(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) >= 0; -} - -template -bool operator>(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) < 0; -} - -template -bool operator>=(std::nullptr_t, const ClonablePtr& right) { - return right.Compare(nullptr) <= 0; -} - -} // namespace cru - -namespace std { -template -struct hash> { - std::size_t operator()(const cru::ClonablePtr& p) const { - return std::hash::pointer>(p.get()); - } -}; -} // namespace std diff --git a/include/cru/base/ClonePtr.h b/include/cru/base/ClonePtr.h new file mode 100644 index 00000000..452c2cdd --- /dev/null +++ b/include/cru/base/ClonePtr.h @@ -0,0 +1,119 @@ +#pragma once + +#include +#include +#include +#include + +namespace cru { +template +class ClonePtr { + template + friend class ClonePtr; + + public: + using element_type = typename std::unique_ptr::element_type; + using pointer = typename std::unique_ptr::pointer; + + ClonePtr() = default; + ClonePtr(std::nullptr_t) noexcept : ptr_(nullptr) {} + explicit ClonePtr(pointer p) noexcept : ptr_(p) {} + ClonePtr(std::unique_ptr&& p) noexcept : ptr_(std::move(p)) {} + template ::pointer, pointer>, + int> = 0> + ClonePtr(std::unique_ptr&& p) : ptr_(std::move(p)) {} + ClonePtr(const ClonePtr& other) : ptr_(other.ptr_->Clone()) {} + ClonePtr(ClonePtr&& other) = default; + template ::pointer, pointer>, + int> = 0> + ClonePtr(const ClonePtr& other) : ptr_(other.ptr_->Clone()) {} + template ::pointer, pointer>, + int> = 0> + ClonePtr(ClonePtr&& other) noexcept : ptr_(std::move(other.ptr_)) {} + ClonePtr& operator=(std::nullptr_t) noexcept { + ptr_ = nullptr; + return *this; + } + ClonePtr& operator=(std::unique_ptr&& other) noexcept { + ptr_ = std::move(other); + return *this; + } + template ::pointer, pointer>, + int> = 0> + ClonePtr& operator=(std::unique_ptr&& p) noexcept { + ptr_ = std::move(p); + return *this; + } + ClonePtr& operator=(const ClonePtr& other) { + if (this != &other) { + ptr_ = std::unique_ptr(other.ptr_->Clone()); + } + return *this; + } + ClonePtr& operator=(ClonePtr&& other) = default; + template ::pointer, pointer>, + int> = 0> + ClonePtr& operator=(const ClonePtr& other) noexcept { + if (this != &other) { + ptr_ = std::unique_ptr(other.ptr_->Clone()); + } + return *this; + } + template ::pointer, pointer>, + int> = 0> + ClonePtr& operator=(ClonePtr&& other) noexcept { + ptr_ = std::move(other.ptr_); + } + + ~ClonePtr() = default; + + public: + pointer release() noexcept { return ptr_.release(); } + void reset(pointer p = pointer()) noexcept { ptr_.reset(p); } + void swap(ClonePtr& other) noexcept { ptr_.swap(other.ptr_); } + + public: + pointer get() const noexcept { return ptr_.get(); } + + operator bool() const noexcept { return ptr_ != nullptr; } + + element_type& operator*() const noexcept { return *ptr_; } + pointer operator->() const noexcept { return ptr_.get(); } + + auto operator<=>(std::nullptr_t) const { return ptr_.operator<=>(nullptr); } + + auto operator<=>(const ClonePtr& other) const { + return ptr_.operator<=>(other.ptr_); + } + + private: + std::unique_ptr ptr_; +}; + +template +void swap(ClonePtr& left, ClonePtr& right) noexcept { + left.swap(right); +} + +} // namespace cru + +namespace std { +template +struct hash> { + std::size_t operator()(const cru::ClonePtr& p) const { + return std::hash::pointer>(p.get()); + } +}; +} // namespace std diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h index 88081816..164329d3 100644 --- a/include/cru/ui/mapper/Mapper.h +++ b/include/cru/ui/mapper/Mapper.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/base/xml/XmlNode.h" #include @@ -88,5 +88,5 @@ template using BasicSharedPtrMapper = BasicMapper>; template -using BasicClonablePtrMapper = BasicMapper>; +using BasicClonePtrMapper = BasicMapper>; } // namespace cru::ui::mapper diff --git a/include/cru/ui/mapper/MapperRegistry.h b/include/cru/ui/mapper/MapperRegistry.h index ca1170b5..fae90b40 100644 --- a/include/cru/ui/mapper/MapperRegistry.h +++ b/include/cru/ui/mapper/MapperRegistry.h @@ -35,8 +35,8 @@ class CRU_UI_API MapperRegistry { } template - BasicClonablePtrMapper* GetClonablePtrMapper() const { - return GetMapper>(); + BasicClonePtrMapper* GetClonePtrMapper() const { + return GetMapper>(); } template diff --git a/include/cru/ui/mapper/style/AndConditionMapper.h b/include/cru/ui/mapper/style/AndConditionMapper.h index 65d0337c..5569e0fc 100644 --- a/include/cru/ui/mapper/style/AndConditionMapper.h +++ b/include/cru/ui/mapper/style/AndConditionMapper.h @@ -4,7 +4,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API AndConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(AndConditionMapper) @@ -13,13 +13,13 @@ class CRU_UI_API AndConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h index 8cb4d392..c1554255 100644 --- a/include/cru/ui/mapper/style/BorderStylerMapper.h +++ b/include/cru/ui/mapper/style/BorderStylerMapper.h @@ -1,13 +1,13 @@ #pragma once #include "../Mapper.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/mapper/style/IStylerMapper.h" #include "cru/ui/style/Styler.h" #include "cru/base/xml/XmlNode.h" namespace cru::ui::mapper::style { class CRU_UI_API BorderStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(BorderStylerMapper) @@ -16,13 +16,13 @@ class CRU_UI_API BorderStylerMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/CheckedConditionMapper.h b/include/cru/ui/mapper/style/CheckedConditionMapper.h index 1bed9597..87d892a7 100644 --- a/include/cru/ui/mapper/style/CheckedConditionMapper.h +++ b/include/cru/ui/mapper/style/CheckedConditionMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API CheckedConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CheckedConditionMapper) @@ -14,13 +14,13 @@ class CRU_UI_API CheckedConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/ClickStateConditionMapper.h b/include/cru/ui/mapper/style/ClickStateConditionMapper.h index a54a3ad4..13c72a36 100644 --- a/include/cru/ui/mapper/style/ClickStateConditionMapper.h +++ b/include/cru/ui/mapper/style/ClickStateConditionMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API ClickStateConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(ClickStateConditionMapper) @@ -14,13 +14,13 @@ class CRU_UI_API ClickStateConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } public: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/ContentBrushStylerMapper.h b/include/cru/ui/mapper/style/ContentBrushStylerMapper.h index 04b19bf8..d15eb28a 100644 --- a/include/cru/ui/mapper/style/ContentBrushStylerMapper.h +++ b/include/cru/ui/mapper/style/ContentBrushStylerMapper.h @@ -4,7 +4,7 @@ namespace cru::ui::mapper::style { class ContentBrushStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: ContentBrushStylerMapper(); @@ -13,13 +13,13 @@ class ContentBrushStylerMapper public: bool SupportMapFromXml() override { return true; } - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/CursorStylerMapper.h b/include/cru/ui/mapper/style/CursorStylerMapper.h index c88a5170..54ade7f0 100644 --- a/include/cru/ui/mapper/style/CursorStylerMapper.h +++ b/include/cru/ui/mapper/style/CursorStylerMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API CursorStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CursorStylerMapper) @@ -14,13 +14,13 @@ class CRU_UI_API CursorStylerMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/FocusConditionMapper.h b/include/cru/ui/mapper/style/FocusConditionMapper.h index 6a7c56a2..e18150cf 100644 --- a/include/cru/ui/mapper/style/FocusConditionMapper.h +++ b/include/cru/ui/mapper/style/FocusConditionMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API FocusConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(FocusConditionMapper) @@ -14,13 +14,13 @@ class CRU_UI_API FocusConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/FontStylerMapper.h b/include/cru/ui/mapper/style/FontStylerMapper.h index 34c94b73..6a79eb99 100644 --- a/include/cru/ui/mapper/style/FontStylerMapper.h +++ b/include/cru/ui/mapper/style/FontStylerMapper.h @@ -3,7 +3,7 @@ #include "IStylerMapper.h" namespace cru::ui::mapper::style { -class FontStylerMapper : public BasicClonablePtrMapper, +class FontStylerMapper : public BasicClonePtrMapper, public virtual IStylerMapper { public: FontStylerMapper(); @@ -12,13 +12,13 @@ class FontStylerMapper : public BasicClonablePtrMapper, public: bool SupportMapFromXml() override { return true; } - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/HoverConditionMapper.h b/include/cru/ui/mapper/style/HoverConditionMapper.h index d3aa0b60..faa889e7 100644 --- a/include/cru/ui/mapper/style/HoverConditionMapper.h +++ b/include/cru/ui/mapper/style/HoverConditionMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API HoverConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(HoverConditionMapper) @@ -14,13 +14,13 @@ class CRU_UI_API HoverConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/IConditionMapper.h b/include/cru/ui/mapper/style/IConditionMapper.h index 7bfd1427..27c09e82 100644 --- a/include/cru/ui/mapper/style/IConditionMapper.h +++ b/include/cru/ui/mapper/style/IConditionMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Condition.h" #include "cru/base/xml/XmlNode.h" @@ -11,7 +11,7 @@ struct CRU_UI_API IConditionMapper : virtual Interface { return dynamic_cast(this)->XmlElementIsOfThisType(node); } - virtual ClonablePtr MapConditionFromXml( + virtual ClonePtr MapConditionFromXml( xml::XmlElementNode* node) = 0; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/IStylerMapper.h b/include/cru/ui/mapper/style/IStylerMapper.h index 4aa43665..ce9c4243 100644 --- a/include/cru/ui/mapper/style/IStylerMapper.h +++ b/include/cru/ui/mapper/style/IStylerMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Styler.h" #include "cru/base/xml/XmlNode.h" @@ -11,7 +11,7 @@ struct CRU_UI_API IStylerMapper : virtual Interface { return dynamic_cast(this)->XmlElementIsOfThisType(node); } - virtual ClonablePtr MapStylerFromXml( + virtual ClonePtr MapStylerFromXml( xml::XmlElementNode* node) = 0; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/MarginStylerMapper.h b/include/cru/ui/mapper/style/MarginStylerMapper.h index 39d55fb6..b20452a9 100644 --- a/include/cru/ui/mapper/style/MarginStylerMapper.h +++ b/include/cru/ui/mapper/style/MarginStylerMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API MarginStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: MarginStylerMapper(); @@ -14,13 +14,13 @@ class CRU_UI_API MarginStylerMapper public: bool SupportMapFromXml() override { return true; } - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h index bd2adf14..8acb79e0 100644 --- a/include/cru/ui/mapper/style/NoConditionMapper.h +++ b/include/cru/ui/mapper/style/NoConditionMapper.h @@ -2,13 +2,13 @@ #include "../Mapper.h" #include "IConditionMapper.h" #include "cru/base/Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/Condition.h" #include "cru/base/xml/XmlNode.h" namespace cru::ui::mapper::style { class CRU_UI_API NoConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(NoConditionMapper) @@ -17,13 +17,13 @@ class CRU_UI_API NoConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/OrConditionMapper.h b/include/cru/ui/mapper/style/OrConditionMapper.h index de8e0695..0aa5b241 100644 --- a/include/cru/ui/mapper/style/OrConditionMapper.h +++ b/include/cru/ui/mapper/style/OrConditionMapper.h @@ -4,7 +4,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API OrConditionMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(OrConditionMapper) @@ -13,13 +13,13 @@ class CRU_UI_API OrConditionMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapConditionFromXml( + ClonePtr MapConditionFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/PaddingStylerMapper.h b/include/cru/ui/mapper/style/PaddingStylerMapper.h index e7515ec1..bf0c5650 100644 --- a/include/cru/ui/mapper/style/PaddingStylerMapper.h +++ b/include/cru/ui/mapper/style/PaddingStylerMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API PaddingStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: PaddingStylerMapper(); @@ -14,13 +14,13 @@ class CRU_UI_API PaddingStylerMapper public: bool SupportMapFromXml() override { return true; } - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h index f46b70d5..ee4f5705 100644 --- a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h +++ b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API PreferredSizeStylerMapper - : public BasicClonablePtrMapper, + : public BasicClonePtrMapper, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(PreferredSizeStylerMapper) @@ -14,13 +14,13 @@ class CRU_UI_API PreferredSizeStylerMapper bool SupportMapFromXml() override { return true; } bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; - ClonablePtr MapStylerFromXml( + ClonePtr MapStylerFromXml( xml::XmlElementNode* node) override { return MapFromXml(node); } protected: - ClonablePtr DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h index b4cb95e7..5622d0f4 100644 --- a/include/cru/ui/mapper/style/StyleRuleMapper.h +++ b/include/cru/ui/mapper/style/StyleRuleMapper.h @@ -1,12 +1,12 @@ #pragma once #include "../Mapper.h" #include "cru/base/Base.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/ui/style/StyleRule.h" #include "cru/base/xml/XmlNode.h" namespace cru::ui::mapper::style { -class CRU_UI_API StyleRuleMapper : public BasicClonablePtrMapper { +class CRU_UI_API StyleRuleMapper : public BasicClonePtrMapper { CRU_DEFINE_CLASS_LOG_TAG("StyleRuleMapper") public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleMapper) @@ -16,7 +16,7 @@ class CRU_UI_API StyleRuleMapper : public BasicClonablePtrMapper DoMapFromXml( + ClonePtr DoMapFromXml( xml::XmlElementNode* node) override; }; } // namespace cru::ui::mapper::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) 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 CheckedConditionEditor::GetValue() +ClonePtr 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 GetValue() const; + ClonePtr GetValue() const; void SetValue(ui::style::CheckedCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr& value, + void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr GetCondition() override { + ClonePtr 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 +ClonePtr 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 GetValue() const; + ClonePtr GetValue() const; void SetValue(ui::style::ClickStateCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr& value, + void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr GetCondition() override { + ClonePtr 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> +std::vector> CompoundConditionEditor::GetChildren() { - std::vector> children; + std::vector> children; for (auto& child : children_) { children.push_back(child->GetCondition()); } @@ -86,7 +86,7 @@ CompoundConditionEditor::GetChildren() { } void CompoundConditionEditor::SetChildren( - std::vector> children, + std::vector> 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> GetChildren(); - void SetChildren(std::vector> children, + std::vector> GetChildren(); + void SetChildren(std::vector> children, bool trigger_change = true); private: @@ -32,18 +32,18 @@ class AndConditionEditor : public CompoundConditionEditor { ~AndConditionEditor() override = default; public: - ClonablePtr GetValue() { + ClonePtr 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& value, + void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr GetCondition() override { + ClonePtr GetCondition() override { return GetValue(); } }; @@ -54,18 +54,18 @@ class OrConditionEditor : public CompoundConditionEditor { ~OrConditionEditor() override = default; public: - ClonablePtr GetValue() { + ClonePtr 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& value, + void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr GetCondition() override { + ClonePtr 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 GetCondition() = 0; + virtual ClonePtr GetCondition() = 0; }; std::unique_ptr 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 FocusConditionEditor::GetValue() const { +ClonePtr 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 GetValue() const; + ClonePtr GetValue() const; void SetValue(ui::style::FocusCondition* value, bool trigger_change = true); - void SetValue(const ClonablePtr& value, + void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonablePtr GetCondition() override { + ClonePtr 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 GetCondition() override { + ClonePtr 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 BorderStylerEditor::GetValue() { +ClonePtr 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::BorderStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr GetStyler() override { return GetValue(); } private: properties::OptionalPropertyEditor 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 CompoundStylerEditor::GetValue() { - std::vector> children_styler; +ClonePtr CompoundStylerEditor::GetValue() { + std::vector> 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::CompoundStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 ContentBrushStylerEditor::GetValue() +ClonePtr 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 GetValue() const; + ClonePtr GetValue() const; void SetValue(ui::style::ContentBrushStyler* value, bool trigger_change = true); - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 CursorStylerEditor::GetValue() { +ClonePtr 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::CursorStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 FontStylerEditor::GetValue() const { +ClonePtr 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 GetValue() const; + ClonePtr GetValue() const; void SetValue(ui::style::FontStyler* value, bool trigger_change = true); - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 MarginStylerEditor::GetValue() { +ClonePtr 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::MarginStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 PaddingStylerEditor::GetValue() { +ClonePtr 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::PaddingStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 +ClonePtr 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 GetValue(); + ClonePtr GetValue(); void SetValue(ui::style::PreferredSizeStyler* styler, bool trigger_change = true); - void SetValue(const ClonablePtr& styler, + void SetValue(const ClonePtr& styler, bool trigger_change = true) { SetValue(styler.get(), trigger_change); } - ClonablePtr GetStyler() override { return GetValue(); } + ClonePtr 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 GetStyler() = 0; + virtual ClonePtr GetStyler() = 0; }; std::unique_ptr CreateStylerEditor(ui::style::Styler* styler); 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