...

1 files changed, 21 insertions, 8 deletions

diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/theme_builder/components/StyleRuleEditor.cpp
index aa2806b1..eefe9451 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/theme_builder/components/StyleRuleEditor.cpp
@@ -1,17 +1,30 @@
 #include "StyleRuleEditor.h"
 #include "conditions/ConditionEditor.h"
+#include "cru/ui/ThemeManager.h"
 #include "cru/ui/style/StyleRule.h"
 
 namespace cru::theme_builder {
 StyleRuleEditor::StyleRuleEditor() {
-  main_layout_.SetFlexDirection(ui::controls::FlexDirection::Horizontal);
-  main_layout_.AddChild(&remove_button_);
+  main_layout_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
+  main_layout_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Start);
 
+  main_layout_.AddChild(&head_layout_);
+
+  label_.SetText(u"Style Rule");
+  head_layout_.AddChild(&label_);
+  head_layout_.AddChild(&remove_button_);
+
+  remove_button_.GetStyleRuleSet()->SetParent(
+      ui::ThemeManager::GetInstance()->GetResourceStyleRuleSet(
+          u"cru.theme_builder.icon-button.style"));
   remove_button_.SetChild(&remove_button_text_);
-  remove_button_text_.SetText(u"X");
+  remove_button_text_.SetText(u"x");
+  remove_button_text_.SetTextColor(ui::colors::red);
 
-  main_layout_.AddChild(&right_layout_);
-  right_layout_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
+  main_layout_.AddChild(&body_layout_);
+  body_layout_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
+  body_layout_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Start);
+  body_layout_.SetMargin({20, 0, 0, 0});
 
   remove_button_.ClickEvent()->AddSpyOnlyHandler(
       [this] { remove_event_.Raise(nullptr); });
@@ -26,13 +39,13 @@ ui::style::StyleRule StyleRuleEditor::GetValue() const {
 
 void StyleRuleEditor::SetValue(const ui::style::StyleRule& style_rule,
                                bool trigger_change) {
-  right_layout_.ClearChildren();
+  body_layout_.ClearChildren();
   condition_editor_ =
       components::conditions::CreateConditionEditor(style_rule.GetCondition());
   styler_editor_ =
       components::stylers::CreateStylerEditor(style_rule.GetStyler());
-  right_layout_.AddChild(condition_editor_->GetRootControl());
-  right_layout_.AddChild(styler_editor_->GetRootControl());
+  body_layout_.AddChild(condition_editor_->GetRootControl());
+  body_layout_.AddChild(styler_editor_->GetRootControl());
   condition_editor_->ChangeEvent()->AddSpyOnlyHandler(
       [this] { change_event_.Raise(nullptr); });
   styler_editor_->ChangeEvent()->AddSpyOnlyHandler(