diff options
Diffstat (limited to 'src/theme_builder/components/conditions')
3 files changed, 8 insertions, 2 deletions
diff --git a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp b/src/theme_builder/components/conditions/CompoundConditionEditor.cpp index 01c5db4c..d0105e70 100644 --- a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp +++ b/src/theme_builder/components/conditions/CompoundConditionEditor.cpp @@ -48,7 +48,7 @@ CompoundConditionEditor::CompoundConditionEditor() { ui::ThemeManager::GetInstance()->GetResourceStyleRuleSet( u"cru.theme_builder.icon-button.style")); add_child_button_.GetButton()->SetIconWithSvgPathDataStringResourceKey( - u"icon.plus-square", {0, 0, 16, 16}); + u"icon.plus", {0, 0, 16, 16}); add_child_button_.GetButton()->SetPreferredSize({24, 24}); add_child_button_.GetButton()->SetPadding(ui::Thickness(2)); add_child_button_.GetButton()->SetIconFillColor(ui::colors::green); diff --git a/src/theme_builder/components/conditions/ConditionEditor.cpp b/src/theme_builder/components/conditions/ConditionEditor.cpp index 3babe19c..a8afa7a7 100644 --- a/src/theme_builder/components/conditions/ConditionEditor.cpp +++ b/src/theme_builder/components/conditions/ConditionEditor.cpp @@ -1,4 +1,5 @@ #include "ConditionEditor.h" +#include "../Common.h" #include "CheckedConditionEditor.h" #include "ClickStateConditionEditor.h" #include "CompoundConditionEditor.h" @@ -9,6 +10,9 @@ namespace cru::theme_builder::components::conditions { ConditionEditor::ConditionEditor() { + border_.SetChild(&container_); + border_.SetBackgroundBrush(CreateRandomEditorBackgroundBrush()); + container_.SetFlexDirection(ui::controls::FlexDirection::Vertical); container_.AddChild(&head_container_); diff --git a/src/theme_builder/components/conditions/ConditionEditor.h b/src/theme_builder/components/conditions/ConditionEditor.h index 35bac560..eea76972 100644 --- a/src/theme_builder/components/conditions/ConditionEditor.h +++ b/src/theme_builder/components/conditions/ConditionEditor.h @@ -1,6 +1,7 @@ #pragma once #include "../Editor.h" #include "cru/common/ClonablePtr.h" +#include "cru/ui/controls/Container.h" #include "cru/ui/controls/FlexLayout.h" #include "cru/ui/controls/TextBlock.h" #include "cru/ui/style/Condition.h" @@ -12,7 +13,7 @@ class ConditionEditor : public Editor { ~ConditionEditor() override; public: - ui::controls::Control* GetRootControl() override { return &container_; } + ui::controls::Control* GetRootControl() override { return &border_; } ui::controls::FlexLayout* GetContainer() { return &container_; } @@ -24,6 +25,7 @@ class ConditionEditor : public Editor { virtual ClonablePtr<ui::style::Condition> GetCondition() = 0; private: + ui::controls::Container border_; ui::controls::FlexLayout container_; ui::controls::FlexLayout head_container_; ui::controls::TextBlock label_; |