...

4 files changed, 39 insertions, 2 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 2e3cd547..e02ad9da 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -34,6 +34,7 @@ add_library(cru_ui SHARED
 	mapper/FontMapper.cpp
 	mapper/Mapper.cpp
 	mapper/MapperRegistry.cpp
+	mapper/MeasureLengthMapper.cpp
 	mapper/PointMapper.cpp
 	mapper/SizeMapper.cpp
 	mapper/ThicknessMapper.cpp
diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp
index b70418ef..9ae95a59 100644
--- a/src/ui/mapper/MapperRegistry.cpp
+++ b/src/ui/mapper/MapperRegistry.cpp
@@ -5,6 +5,7 @@
 #include "cru/ui/mapper/CornerRadiusMapper.h"
 #include "cru/ui/mapper/CursorMapper.h"
 #include "cru/ui/mapper/FontMapper.h"
+#include "cru/ui/mapper/MeasureLengthMapper.h"
 #include "cru/ui/mapper/PointMapper.h"
 #include "cru/ui/mapper/SizeMapper.h"
 #include "cru/ui/mapper/ThicknessMapper.h"
@@ -33,6 +34,7 @@ MapperRegistry::MapperRegistry() {
   RegisterMapper(new BrushMapper());
   RegisterMapper(new CornerRadiusMapper());
   RegisterMapper(new FontMapper());
+  RegisterMapper(new MeasureLengthMapper());
   RegisterMapper(new PointMapper());
   RegisterMapper(new SizeMapper());
   RegisterMapper(new ThicknessMapper());
diff --git a/src/ui/mapper/MeasureLengthMapper.cpp b/src/ui/mapper/MeasureLengthMapper.cpp
new file mode 100644
index 00000000..6a0f95e3
--- /dev/null
+++ b/src/ui/mapper/MeasureLengthMapper.cpp
@@ -0,0 +1,29 @@
+#include "cru/ui/mapper/MeasureLengthMapper.h"
+#include "cru/ui/render/MeasureRequirement.h"
+
+namespace cru::ui::mapper {
+bool MeasureLengthMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
+  return node->GetTag().CaseInsensitiveEqual(u"MeasureLength");
+}
+
+render::MeasureLength MeasureLengthMapper::DoMapFromString(String str) {
+  if (str.CaseInsensitiveEqual(u"notspecified")) {
+    return render::MeasureLength::NotSpecified();
+  }
+  if (str.CaseInsensitiveEqual(u"unspecified")) {
+    return render::MeasureLength::NotSpecified();
+  }
+  auto value = str.ParseToFloat();
+  if (value < 0) {
+    return render::MeasureLength::NotSpecified();
+  }
+  return render::MeasureLength(value);
+}
+
+render::MeasureLength MeasureLengthMapper::DoMapFromXml(
+    xml::XmlElementNode* node) {
+  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  if (!value_attr) return {};
+  return DoMapFromString(*value_attr);
+}
+}  // namespace cru::ui::mapper
diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
index b4382c19..9e03dfeb 100644
--- a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
+++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
@@ -1,4 +1,5 @@
 #include "cru/ui/mapper/style/PreferredSizeStylerMapper.h"
+#include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/render/MeasureRequirement.h"
 #include "cru/ui/style/Styler.h"
 
@@ -11,14 +12,18 @@ bool PreferredSizeStylerMapper::XmlElementIsOfThisType(
 ClonablePtr<ui::style::PreferredSizeStyler>
 PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
   render::MeasureSize size;
+
+  auto measure_length_mapper =
+      MapperRegistry::GetInstance()->GetMapper<render::MeasureLength>();
+
   auto width_attribute = node->GetOptionalAttributeCaseInsensitive(u"width");
   if (width_attribute) {
-    size.width = width_attribute->ParseToFloat();
+    size.width = measure_length_mapper->MapFromString(*width_attribute);
   }
 
   auto height_attribute = node->GetOptionalAttributeCaseInsensitive(u"height");
   if (height_attribute) {
-    size.height = height_attribute->ParseToFloat();
+    size.height = measure_length_mapper->MapFromString(*height_attribute);
   }
 
   return ui::style::PreferredSizeStyler::Create(size);