3 files changed, 73 insertions, 0 deletions
diff --git a/src/theme_builder/CMakeLists.txt b/src/theme_builder/CMakeLists.txt
index 6bdd44b2..0c3e1926 100644
--- a/src/theme_builder/CMakeLists.txt
+++ b/src/theme_builder/CMakeLists.txt
@@ -13,6 +13,7 @@ add_executable(cru_theme_builder
 	components/properties/CheckBoxPropertyEditor.cpp
 	components/properties/ColorPropertyEditor.cpp
 	components/properties/CornerRadiusPropertyEditor.cpp
+	components/properties/MeasureLengthPropertyEditor.cpp
 	components/properties/PointPropertyEditor.cpp
 	components/properties/SelectPropertyEditor.cpp
 	components/properties/TextPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.cpp b/src/theme_builder/components/properties/MeasureLengthPropertyEditor.cpp
new file mode 100644
index 00000000..d1f4afce
--- /dev/null
+++ b/src/theme_builder/components/properties/MeasureLengthPropertyEditor.cpp
@@ -0,0 +1,37 @@
+#include "MeasureLengthPropertyEditor.h"
+#include "cru/common/Format.h"
+#include "cru/ui/mapper/MapperRegistry.h"
+#include "cru/ui/render/MeasureRequirement.h"
+
+namespace cru::theme_builder::components::properties {
+MeasureLengthPropertyEditor::MeasureLengthPropertyEditor() {
+  container_.AddChild(&label_);
+  container_.AddChild(&text_);
+
+  text_.TextChangeEvent()->AddHandler([this](std::nullptr_t) {
+    auto text = text_.GetTextView();
+    auto measure_length_mapper = ui::mapper::MapperRegistry::GetInstance()
+                                     ->GetMapper<ui::render::MeasureLength>();
+    try {
+      auto measure_length =
+          measure_length_mapper->MapFromString(text.ToString());
+      measure_length_ = measure_length;
+      is_text_valid_ = true;
+      RaiseChangeEvent();
+    } catch (const Exception&) {
+      is_text_valid_ = false;
+      // TODO: Show error!
+    }
+  });
+}
+
+MeasureLengthPropertyEditor::~MeasureLengthPropertyEditor() {}
+
+void MeasureLengthPropertyEditor::SetValue(
+    const ui::render::MeasureLength& value, bool trigger_change) {
+  if (!trigger_change) SuppressNextChangeEvent();
+  text_.SetText(measure_length_.IsNotSpecified()
+                    ? u"unspecified"
+                    : ToString(measure_length_.GetLengthOrUndefined()));
+}
+}  // namespace cru::theme_builder::components::properties
diff --git a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.h b/src/theme_builder/components/properties/MeasureLengthPropertyEditor.h
new file mode 100644
index 00000000..43e783c5
--- /dev/null
+++ b/src/theme_builder/components/properties/MeasureLengthPropertyEditor.h
@@ -0,0 +1,35 @@
+#pragma once
+#include "../Editor.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/ui/controls/Container.h"
+#include "cru/ui/controls/FlexLayout.h"
+#include "cru/ui/controls/TextBlock.h"
+#include "cru/ui/controls/TextBox.h"
+#include "cru/ui/render/MeasureRequirement.h"
+
+namespace cru::theme_builder::components::properties {
+class MeasureLengthPropertyEditor : public Editor {
+ public:
+  using PropertyType = ui::render::MeasureLength;
+
+  MeasureLengthPropertyEditor();
+  ~MeasureLengthPropertyEditor() override;
+
+ public:
+  ui::controls::Control* GetRootControl() override { return &container_; }
+
+  String GetLabel() const { return label_.GetText(); }
+  void SetLabel(String label) { label_.SetText(std::move(label)); }
+
+  PropertyType GetValue() const { return measure_length_; }
+  void SetValue(const PropertyType& value, bool trigger_change = true);
+
+ private:
+  PropertyType measure_length_;
+
+  ui::controls::FlexLayout container_;
+  ui::controls::TextBlock label_;
+  ui::controls::TextBox text_;
+  bool is_text_valid_;
+};
+}  // namespace cru::theme_builder::components::properties