diff options
Diffstat (limited to 'src/ThemeBuilder/components/stylers')
18 files changed, 78 insertions, 82 deletions
diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp index 1329a08a..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" @@ -8,17 +8,17 @@ namespace cru::theme_builder::components::stylers { BorderStylerEditor::BorderStylerEditor() { - SetLabel(u"Border Styler"); + SetLabel("Border Styler"); GetContainer()->AddChild(corner_radius_editor_.GetRootControl()); GetContainer()->AddChild(thickness_editor_.GetRootControl()); GetContainer()->AddChild(brush_editor_.GetRootControl()); GetContainer()->AddChild(foreground_brush_editor_.GetRootControl()); GetContainer()->AddChild(background_brush_editor_.GetRootControl()); - thickness_editor_.GetEditor()->SetLabel(u"Thickness"); - brush_editor_.GetEditor()->SetLabel(u"Border"); - foreground_brush_editor_.GetEditor()->SetLabel(u"Foreground"); - background_brush_editor_.GetEditor()->SetLabel(u"Background"); + thickness_editor_.GetEditor()->SetLabel("Thickness"); + brush_editor_.GetEditor()->SetLabel("Border"); + foreground_brush_editor_.GetEditor()->SetLabel("Foreground"); + background_brush_editor_.GetEditor()->SetLabel("Background"); ConnectChangeEvent(corner_radius_editor_); ConnectChangeEvent(thickness_editor_); @@ -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(); @@ -67,7 +67,7 @@ void BorderStylerEditor::SetValue(ui::style::BorderStyler* styler, if (border_style.border_brush.has_value()) { brush_editor_.GetEditor()->SetValue( std::dynamic_pointer_cast<platform::graphics::ISolidColorBrush>( - border_style.border_brush.value()) + *border_style.border_brush) ->GetColor(), false); } @@ -77,7 +77,7 @@ void BorderStylerEditor::SetValue(ui::style::BorderStyler* styler, if (border_style.foreground_brush.has_value()) { foreground_brush_editor_.GetEditor()->SetValue( std::dynamic_pointer_cast<platform::graphics::ISolidColorBrush>( - border_style.foreground_brush.value()) + *border_style.foreground_brush) ->GetColor(), false); } @@ -87,7 +87,7 @@ void BorderStylerEditor::SetValue(ui::style::BorderStyler* styler, if (border_style.background_brush.has_value()) { background_brush_editor_.GetEditor()->SetValue( std::dynamic_pointer_cast<platform::graphics::ISolidColorBrush>( - border_style.background_brush.value()) + *border_style.background_brush) ->GetColor(), false); } 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 c8b2a871..fb144e60 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp @@ -6,13 +6,14 @@ #include "MarginStylerEditor.h" #include "PaddingStylerEditor.h" #include "PreferredSizeStylerEditor.h" -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" +#include "cru/platform/gui/DeleteLater.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { CompoundStylerEditor::CompoundStylerEditor() { - SetLabel(u"Compound Styler"); + SetLabel("Compound Styler"); GetContainer()->AddChild(&children_container_); children_container_.SetFlexDirection(ui::controls::FlexDirection::Vertical); children_container_.SetItemCrossAlign( @@ -21,16 +22,16 @@ CompoundStylerEditor::CompoundStylerEditor() { GetHeadContainer()->AddChild(add_child_button_.GetRootControl()); add_child_button_.GetButton()->GetStyleRuleSet()->SetParent( ui::ThemeManager::GetInstance()->GetResourceStyleRuleSet( - u"cru.theme_builder.icon-button.style")); + "cru.theme_builder.icon-button.style")); add_child_button_.GetButton()->SetIconWithSvgPathDataStringResourceKey( - u"icon.plus", {0, 0, 16, 16}); - add_child_button_.GetButton()->SetPreferredSize({24, 24}); + "icon.plus", {0, 0, 16, 16}); + add_child_button_.GetButton()->SetSuggestSize({24, 24}); add_child_button_.GetButton()->SetPadding(ui::Thickness(2)); add_child_button_.GetButton()->SetIconFillColor(ui::colors::green); - add_child_button_.SetMenuItems({u"Compound Styler", u"Border Styler", - u"Cursor Styler", u"Content Brush Styler", - u"Font Styler", u"Margin Styler", - u"Padding Styler", u"Preferred Size Styler"}); + add_child_button_.SetMenuItems({"Compound Styler", "Border Styler", + "Cursor Styler", "Content Brush Styler", + "Font Styler", "Margin Styler", + "Padding Styler", "Preferred Size Styler"}); add_child_button_.MenuItemSelectedEvent()->AddHandler([this](Index index) { std::unique_ptr<StylerEditor> editor; switch (index) { @@ -64,12 +65,13 @@ CompoundStylerEditor::CompoundStylerEditor() { if (editor) { ConnectChangeEvent(editor.get()); editor->RemoveEvent()->AddSpyOnlyHandler([this, c = editor.get()] { - auto index = this->children_container_.IndexOf(c->GetRootControl()); + auto index = + this->children_container_.IndexOfChild(c->GetRootControl()); this->children_.erase(this->children_.begin() + index); this->children_container_.RemoveChildAt(index); RaiseChangeEvent(); }); - children_.push_back(std::move(editor)); + children_.push_back(platform::gui::ToDeleteLaterPtr(std::move(editor))); children_container_.AddChild(editor->GetRootControl()); RaiseChangeEvent(); } @@ -78,8 +80,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()); } @@ -93,12 +95,12 @@ void CompoundStylerEditor::SetValue(ui::style::CompoundStyler* value, auto editor = CreateStylerEditor(styler.get()); ConnectChangeEvent(editor.get()); editor->RemoveEvent()->AddSpyOnlyHandler([this, c = editor.get()] { - auto index = this->children_container_.IndexOf(c->GetRootControl()); + auto index = this->children_container_.IndexOfChild(c->GetRootControl()); this->children_.erase(this->children_.begin() + index); this->children_container_.RemoveChildAt(index); RaiseChangeEvent(); }); - children_.push_back(std::move(editor)); + children_.push_back(platform::gui::ToDeleteLaterPtr(std::move(editor))); children_container_.AddChild(children_.back()->GetRootControl()); } } diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h index 91d2bff5..454b3622 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "StylerEditor.h" -#include "cru/base/ClonablePtr.h" -#include "cru/ui/DeleteLater.h" +#include "cru/base/ClonePtr.h" +#include "cru/platform/gui/DeleteLater.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/FlexLayout.h" #include "cru/ui/style/Styler.h" @@ -13,18 +13,18 @@ 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_; - std::vector<ui::DeleteLaterPtr<StylerEditor>> children_; + std::vector<platform::gui::DeleteLaterPtr<StylerEditor>> children_; ui::components::PopupMenuIconButton add_child_button_; }; } // namespace cru::theme_builder::components::stylers diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp index bd649c67..98bc14b7 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp @@ -12,8 +12,7 @@ ContentBrushStylerEditor::ContentBrushStylerEditor() { ContentBrushStylerEditor::~ContentBrushStylerEditor() {} -ClonablePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue() - const { +ClonePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue() { return ui::style::ContentBrushStyler::Create( platform::gui::IUiApplication::GetInstance() ->GetGraphicsFactory() diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h index ec51c041..b1b179a1 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h @@ -1,8 +1,7 @@ #pragma once -#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 +11,11 @@ class ContentBrushStylerEditor : public StylerEditor { ~ContentBrushStylerEditor(); public: - ClonablePtr<ui::style::ContentBrushStyler> GetValue() const; + ClonePtr<ui::style::ContentBrushStyler> GetValue(); 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 9984d81a..589efc2b 100644 --- a/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp @@ -4,11 +4,11 @@ namespace cru::theme_builder::components::stylers { CursorStylerEditor::CursorStylerEditor() { - SetLabel(u"Cursor Styler"); + SetLabel("Cursor Styler"); GetContainer()->AddChild(cursor_select_.GetRootControl()); - cursor_select_.SetLabel(u"Cursor"); - cursor_select_.SetItems({u"arrow", u"hand", u"ibeam"}); + cursor_select_.SetLabel("Cursor"); + cursor_select_.SetItems({"arrow", "hand", "ibeam"}); cursor_select_.SetSelectedIndex(0); ConnectChangeEvent(cursor_select_); @@ -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..e84a439c 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp @@ -1,6 +1,4 @@ #include "FontStylerEditor.h" -#include "cru/platform/graphics/Factory.h" -#include "cru/platform/gui/UiApplication.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { @@ -12,7 +10,7 @@ FontStylerEditor::FontStylerEditor() { FontStylerEditor::~FontStylerEditor() {} -ClonablePtr<ui::style::FontStyler> FontStylerEditor::GetValue() const { +ClonePtr<ui::style::FontStyler> FontStylerEditor::GetValue() { 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..11c931d3 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h @@ -1,8 +1,7 @@ #pragma once -#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 +11,10 @@ class FontStylerEditor : public StylerEditor { ~FontStylerEditor(); public: - ClonablePtr<ui::style::FontStyler> GetValue() const; + ClonePtr<ui::style::FontStyler> GetValue(); 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 d7d89acb..bfd15903 100644 --- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp @@ -3,17 +3,17 @@ namespace cru::theme_builder::components::stylers { MarginStylerEditor::MarginStylerEditor() { - SetLabel(u"Margin Styler"); + SetLabel("Margin Styler"); GetContainer()->AddChild(thickness_editor_.GetRootControl()); - thickness_editor_.SetLabel(u"Thickness"); + thickness_editor_.SetLabel("Thickness"); ConnectChangeEvent(thickness_editor_); } 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 476d21f1..1ad6cf35 100644 --- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp @@ -3,17 +3,17 @@ namespace cru::theme_builder::components::stylers { PaddingStylerEditor::PaddingStylerEditor() { - SetLabel(u"Padding Styler"); + SetLabel("Padding Styler"); GetContainer()->AddChild(thickness_editor_.GetRootControl()); - thickness_editor_.SetLabel(u"Thickness"); + thickness_editor_.SetLabel("Thickness"); ConnectChangeEvent(thickness_editor_); } 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 fb713c8c..d230e09c 100644 --- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp @@ -3,12 +3,12 @@ namespace cru::theme_builder::components::stylers { PreferredSizeStylerEditor::PreferredSizeStylerEditor() { - SetLabel(u"Preferred Size Styler"); + SetLabel("Preferred Size Styler"); GetContainer()->AddChild(width_editor_.GetRootControl()); GetContainer()->AddChild(height_editor_.GetRootControl()); - width_editor_.SetLabel(u"Width"); - height_editor_.SetLabel(u"Height"); + width_editor_.SetLabel("Width"); + height_editor_.SetLabel("Height"); ConnectChangeEvent(width_editor_); ConnectChangeEvent(height_editor_); @@ -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()}); @@ -24,8 +24,8 @@ PreferredSizeStylerEditor::GetValue() { void PreferredSizeStylerEditor::SetValue(ui::style::PreferredSizeStyler* styler, bool trigger_change) { - width_editor_.SetValue(styler->GetPreferredSize().width, false); - height_editor_.SetValue(styler->GetPreferredSize().height, false); + width_editor_.SetValue(styler->GetSuggestSize().width, false); + height_editor_.SetValue(styler->GetSuggestSize().height, false); if (trigger_change) { RaiseChangeEvent(); 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.cpp b/src/ThemeBuilder/components/stylers/StylerEditor.cpp index b3147a15..fbc97808 100644 --- a/src/ThemeBuilder/components/stylers/StylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/StylerEditor.cpp @@ -8,7 +8,6 @@ #include "MarginStylerEditor.h" #include "PaddingStylerEditor.h" #include "PreferredSizeStylerEditor.h" -#include "cru/base/Exception.h" #include "cru/ui/controls/FlexLayout.h" #include "cru/ui/render/FlexLayoutRenderObject.h" #include "cru/ui/style/Styler.h" @@ -58,7 +57,7 @@ std::unique_ptr<StylerEditor> CreateStylerEditor(ui::style::Styler* styler) { editor->SetValue(font_styler); return editor; } else { - throw Exception(u"Unknown styler type"); + throw Exception("Unknown styler type"); } } } // namespace cru::theme_builder::components::stylers 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); |