...

12 files changed, 193 insertions, 0 deletions

diff --git a/src/theme_builder/CMakeLists.txt b/src/theme_builder/CMakeLists.txt
index 709c4d76..40d23c4a 100644
--- a/src/theme_builder/CMakeLists.txt
+++ b/src/theme_builder/CMakeLists.txt
@@ -21,6 +21,8 @@ add_executable(cru_theme_builder
 	components/stylers/BorderStylerEditor.cpp
 	components/stylers/CompoundStylerEditor.cpp
 	components/stylers/CursorStylerEditor.cpp
+	components/stylers/MarginStylerEditor.cpp
+	components/stylers/PaddingStylerEditor.cpp
 	components/stylers/PreferredSizeStylerEditor.cpp
 	components/stylers/StylerEditor.cpp
 )
diff --git a/src/theme_builder/components/stylers/MarginStylerEditor.cpp b/src/theme_builder/components/stylers/MarginStylerEditor.cpp
new file mode 100644
index 00000000..d7d89acb
--- /dev/null
+++ b/src/theme_builder/components/stylers/MarginStylerEditor.cpp
@@ -0,0 +1,28 @@
+#include "MarginStylerEditor.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::theme_builder::components::stylers {
+MarginStylerEditor::MarginStylerEditor() {
+  SetLabel(u"Margin Styler");
+  GetContainer()->AddChild(thickness_editor_.GetRootControl());
+
+  thickness_editor_.SetLabel(u"Thickness");
+
+  ConnectChangeEvent(thickness_editor_);
+}
+
+MarginStylerEditor::~MarginStylerEditor() {}
+
+ClonablePtr<ui::style::MarginStyler> MarginStylerEditor::GetValue() {
+  return ui::style::MarginStyler::Create(thickness_editor_.GetValue());
+}
+
+void MarginStylerEditor::SetValue(ui::style::MarginStyler* styler,
+                                  bool trigger_change) {
+  thickness_editor_.SetValue(styler->GetMargin(), false);
+
+  if (trigger_change) {
+    RaiseChangeEvent();
+  }
+}
+}  // namespace cru::theme_builder::components::stylers
diff --git a/src/theme_builder/components/stylers/MarginStylerEditor.h b/src/theme_builder/components/stylers/MarginStylerEditor.h
new file mode 100644
index 00000000..9de6f1a2
--- /dev/null
+++ b/src/theme_builder/components/stylers/MarginStylerEditor.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "../properties/ThicknessPropertyEditor.h"
+#include "StylerEditor.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::theme_builder::components::stylers {
+class MarginStylerEditor : public StylerEditor {
+ public:
+  MarginStylerEditor();
+  ~MarginStylerEditor() override;
+
+  ClonablePtr<ui::style::MarginStyler> GetValue();
+  void SetValue(ui::style::MarginStyler* styler, bool trigger_change = true);
+  void SetValue(const ClonablePtr<ui::style::MarginStyler>& styler,
+                bool trigger_change = true) {
+    SetValue(styler.get(), trigger_change);
+  }
+
+  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+
+ private:
+  properties::ThicknessPropertyEditor thickness_editor_;
+};
+}  // namespace cru::theme_builder::components::stylers
diff --git a/src/theme_builder/components/stylers/PaddingStylerEditor.cpp b/src/theme_builder/components/stylers/PaddingStylerEditor.cpp
new file mode 100644
index 00000000..476d21f1
--- /dev/null
+++ b/src/theme_builder/components/stylers/PaddingStylerEditor.cpp
@@ -0,0 +1,28 @@
+#include "PaddingStylerEditor.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::theme_builder::components::stylers {
+PaddingStylerEditor::PaddingStylerEditor() {
+  SetLabel(u"Padding Styler");
+  GetContainer()->AddChild(thickness_editor_.GetRootControl());
+
+  thickness_editor_.SetLabel(u"Thickness");
+
+  ConnectChangeEvent(thickness_editor_);
+}
+
+PaddingStylerEditor::~PaddingStylerEditor() {}
+
+ClonablePtr<ui::style::PaddingStyler> PaddingStylerEditor::GetValue() {
+  return ui::style::PaddingStyler::Create(thickness_editor_.GetValue());
+}
+
+void PaddingStylerEditor::SetValue(ui::style::PaddingStyler* styler,
+                                   bool trigger_change) {
+  thickness_editor_.SetValue(styler->GetPadding(), false);
+
+  if (trigger_change) {
+    RaiseChangeEvent();
+  }
+}
+}  // namespace cru::theme_builder::components::stylers
diff --git a/src/theme_builder/components/stylers/PaddingStylerEditor.h b/src/theme_builder/components/stylers/PaddingStylerEditor.h
new file mode 100644
index 00000000..b78d310b
--- /dev/null
+++ b/src/theme_builder/components/stylers/PaddingStylerEditor.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "../properties/ThicknessPropertyEditor.h"
+#include "StylerEditor.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::theme_builder::components::stylers {
+class PaddingStylerEditor : public StylerEditor {
+ public:
+  PaddingStylerEditor();
+  ~PaddingStylerEditor() override;
+
+  ClonablePtr<ui::style::PaddingStyler> GetValue();
+  void SetValue(ui::style::PaddingStyler* styler, bool trigger_change = true);
+  void SetValue(const ClonablePtr<ui::style::PaddingStyler>& styler,
+                bool trigger_change = true) {
+    SetValue(styler.get(), trigger_change);
+  }
+
+  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+
+ private:
+  properties::ThicknessPropertyEditor thickness_editor_;
+};
+}  // namespace cru::theme_builder::components::stylers
diff --git a/src/theme_builder/components/stylers/StylerEditor.cpp b/src/theme_builder/components/stylers/StylerEditor.cpp
index 08684edc..030a3752 100644
--- a/src/theme_builder/components/stylers/StylerEditor.cpp
+++ b/src/theme_builder/components/stylers/StylerEditor.cpp
@@ -2,6 +2,8 @@
 #include "BorderStylerEditor.h"
 #include "CompoundStylerEditor.h"
 #include "CursorStylerEditor.h"
+#include "MarginStylerEditor.h"
+#include "PaddingStylerEditor.h"
 #include "PreferredSizeStylerEditor.h"
 #include "cru/ui/style/Styler.h"
 
@@ -33,6 +35,16 @@ std::unique_ptr<StylerEditor> CreateStylerEditor(ui::style::Styler* styler) {
     auto editor = std::make_unique<PreferredSizeStylerEditor>();
     editor->SetValue(preferred_size_styler);
     return editor;
+  } else if (auto margin_styler =
+                 dynamic_cast<ui::style::MarginStyler*>(styler)) {
+    auto editor = std::make_unique<MarginStylerEditor>();
+    editor->SetValue(margin_styler);
+    return editor;
+  } else if (auto padding_styler =
+                 dynamic_cast<ui::style::PaddingStyler*>(styler)) {
+    auto editor = std::make_unique<PaddingStylerEditor>();
+    editor->SetValue(padding_styler);
+    return editor;
   } else {
     throw Exception(u"Unknown styler type");
   }
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e02ad9da..e3819800 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -45,8 +45,10 @@ add_library(cru_ui SHARED
 	mapper/style/CursorStylerMapper.cpp
 	mapper/style/FocusConditionMapper.cpp
 	mapper/style/HoverConditionMapper.cpp
+	mapper/style/MarginStylerMapper.cpp
 	mapper/style/NoConditionMapper.cpp
 	mapper/style/OrConditionMapper.cpp
+	mapper/style/PaddingStylerMapper.cpp
 	mapper/style/PreferredSizeStylerMapper.cpp
 	mapper/style/StyleRuleMapper.cpp
 	mapper/style/StyleRuleSetMapper.cpp
diff --git a/src/ui/mapper/Mapper.cpp b/src/ui/mapper/Mapper.cpp
index 40653118..ebf880a2 100644
--- a/src/ui/mapper/Mapper.cpp
+++ b/src/ui/mapper/Mapper.cpp
@@ -5,4 +5,13 @@
 namespace cru::ui::mapper {
 MapperBase::MapperBase(std::type_index type_index)
     : type_index_(std::move(type_index)) {}
+
+bool MapperBase::XmlElementIsOfThisType(xml::XmlElementNode* node) {
+  for (const auto& tag : allowed_tags_) {
+    if (node->GetTag().CaseInsensitiveEqual(tag)) {
+      return true;
+    }
+  }
+  return false;
+}
 }  // namespace cru::ui::mapper
diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp
index 9ae95a59..ad5b7e8d 100644
--- a/src/ui/mapper/MapperRegistry.cpp
+++ b/src/ui/mapper/MapperRegistry.cpp
@@ -16,8 +16,10 @@
 #include "cru/ui/mapper/style/CursorStylerMapper.h"
 #include "cru/ui/mapper/style/FocusConditionMapper.h"
 #include "cru/ui/mapper/style/HoverConditionMapper.h"
+#include "cru/ui/mapper/style/MarginStylerMapper.h"
 #include "cru/ui/mapper/style/NoConditionMapper.h"
 #include "cru/ui/mapper/style/OrConditionMapper.h"
+#include "cru/ui/mapper/style/PaddingStylerMapper.h"
 #include "cru/ui/mapper/style/PreferredSizeStylerMapper.h"
 #include "cru/ui/mapper/style/StyleRuleMapper.h"
 #include "cru/ui/mapper/style/StyleRuleSetMapper.h"
@@ -48,8 +50,10 @@ MapperRegistry::MapperRegistry() {
   RegisterMapper(new CursorStylerMapper());
   RegisterMapper(new FocusConditionMapper());
   RegisterMapper(new HoverConditionMapper());
+  RegisterMapper(new MarginStylerMapper());
   RegisterMapper(new NoConditionMapper());
   RegisterMapper(new OrConditionMapper());
+  RegisterMapper(new PaddingStylerMapper());
   RegisterMapper(new PreferredSizeStylerMapper());
   RegisterMapper(new StyleRuleMapper());
   RegisterMapper(new StyleRuleSetMapper());
diff --git a/src/ui/mapper/style/MarginStylerMapper.cpp b/src/ui/mapper/style/MarginStylerMapper.cpp
new file mode 100644
index 00000000..cb2fd7ee
--- /dev/null
+++ b/src/ui/mapper/style/MarginStylerMapper.cpp
@@ -0,0 +1,24 @@
+#include "cru/ui/mapper/style/MarginStylerMapper.h"
+#include "cru/ui/mapper/MapperRegistry.h"
+#include "cru/ui/render/MeasureRequirement.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::ui::mapper::style {
+MarginStylerMapper::MarginStylerMapper() { SetAllowedTags({u"MarginStyler"}); }
+
+MarginStylerMapper::~MarginStylerMapper() {}
+
+ClonablePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
+    xml::XmlElementNode* node) {
+  Thickness thickness;
+
+  auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
+
+  auto value_attribute = node->GetOptionalAttributeCaseInsensitive(u"value");
+  if (value_attribute) {
+    thickness = thickness_mapper->MapFromString(*value_attribute);
+  }
+
+  return ui::style::MarginStyler::Create(thickness);
+}
+}  // namespace cru::ui::mapper::style
diff --git a/src/ui/mapper/style/PaddingStylerMapper.cpp b/src/ui/mapper/style/PaddingStylerMapper.cpp
new file mode 100644
index 00000000..cd316cd2
--- /dev/null
+++ b/src/ui/mapper/style/PaddingStylerMapper.cpp
@@ -0,0 +1,26 @@
+#include "cru/ui/mapper/style/PaddingStylerMapper.h"
+#include "cru/ui/mapper/MapperRegistry.h"
+#include "cru/ui/render/MeasureRequirement.h"
+#include "cru/ui/style/Styler.h"
+
+namespace cru::ui::mapper::style {
+PaddingStylerMapper::PaddingStylerMapper() {
+  SetAllowedTags({u"PaddingStyler"});
+}
+
+PaddingStylerMapper::~PaddingStylerMapper() {}
+
+ClonablePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
+    xml::XmlElementNode* node) {
+  Thickness thickness;
+
+  auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
+
+  auto value_attribute = node->GetOptionalAttributeCaseInsensitive(u"value");
+  if (value_attribute) {
+    thickness = thickness_mapper->MapFromString(*value_attribute);
+  }
+
+  return ui::style::PaddingStyler::Create(thickness);
+}
+}  // namespace cru::ui::mapper::style
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
index 7085fd3e..44a24462 100644
--- a/src/ui/style/Styler.cpp
+++ b/src/ui/style/Styler.cpp
@@ -30,4 +30,12 @@ void CursorStyler::Apply(controls::Control *control) const {
 void PreferredSizeStyler::Apply(controls::Control *control) const {
   control->SetPreferredSize(size_);
 }
+
+void MarginStyler::Apply(controls::Control *control) const {
+  control->SetMargin(margin_);
+}
+
+void PaddingStyler::Apply(controls::Control *control) const {
+  control->SetPadding(padding_);
+}
 }  // namespace cru::ui::style