...

5 files changed, 60 insertions, 2 deletions

diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h
index 3293969d..c52a53af 100644
--- a/include/cru/ui/controls/Control.h
+++ b/include/cru/ui/controls/Control.h
@@ -3,6 +3,7 @@
 #include "../events/UiEvents.h"
 #include "../render/RenderObject.h"
 #include "../style/StyleRuleSet.h"
+#include "cru/ui/render/MeasureRequirement.h"
 
 namespace cru::ui::controls {
 
@@ -13,8 +14,7 @@ namespace cru::ui::controls {
  *  - GetRenderObject()
  *  - ForEachChild(const std::function<void(Control*)>& predicate)
  *  - RemoveChild(Control* child)
- * The last two methods are totally for convenient control tree management. The
- * former one is even not used.
+ * The last two methods are totally for convenient control tree management.
  */
 class CRU_UI_API Control : public Object {
   friend class RootControl;
@@ -52,6 +52,13 @@ class CRU_UI_API Control : public Object {
  public:
   virtual render::RenderObject* GetRenderObject() const = 0;
 
+  render::MeasureSize GetPreferredSize() {
+    return GetRenderObject()->GetPreferredSize();
+  }
+  void SetPreferredSize(const render::MeasureSize& size) {
+    GetRenderObject()->SetPreferredSize(size);
+  }
+
   //*************** region: focus ***************
  public:
   bool HasFocus();
diff --git a/include/cru/ui/mapper/style/CheckedConditionMapper.h b/include/cru/ui/mapper/style/CheckedConditionMapper.h
new file mode 100644
index 00000000..d62aba60
--- /dev/null
+++ b/include/cru/ui/mapper/style/CheckedConditionMapper.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "../Mapper.h"
+#include "IConditionMapper.h"
+#include "cru/ui/style/Condition.h"
+
+namespace cru::ui::mapper::style {
+class CRU_UI_API CheckedConditionMapper
+    : public BasicPtrMapper<ui::style::CheckedCondition>,
+      public virtual IConditionMapper {
+ public:
+  CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CheckedConditionMapper)
+
+ public:
+  bool SupportMapFromXml() override { return true; }
+  bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
+
+  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+      xml::XmlElementNode* node) override {
+    return MapFromXml(node);
+  }
+
+ protected:
+  ClonablePtr<ui::style::CheckedCondition> DoMapFromXml(
+      xml::XmlElementNode* node) override;
+};
+}  // namespace cru::ui::mapper::style
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 91128862..84f67407 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -39,6 +39,7 @@ add_library(cru_ui SHARED
 	mapper/ThicknessMapper.cpp
 	mapper/style/AndConditionMapper.cpp
 	mapper/style/BorderStylerMapper.cpp
+	mapper/style/CheckedConditionMapper.cpp
 	mapper/style/ClickStateConditionMapper.cpp
 	mapper/style/CursorStylerMapper.cpp
 	mapper/style/FocusConditionMapper.cpp
diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp
index 83105b9b..afbbc8b9 100644
--- a/src/ui/mapper/MapperRegistry.cpp
+++ b/src/ui/mapper/MapperRegistry.cpp
@@ -10,6 +10,7 @@
 #include "cru/ui/mapper/ThicknessMapper.h"
 #include "cru/ui/mapper/style/AndConditionMapper.h"
 #include "cru/ui/mapper/style/BorderStylerMapper.h"
+#include "cru/ui/mapper/style/CheckedConditionMapper.h"
 #include "cru/ui/mapper/style/ClickStateConditionMapper.h"
 #include "cru/ui/mapper/style/CursorStylerMapper.h"
 #include "cru/ui/mapper/style/FocusConditionMapper.h"
@@ -39,6 +40,7 @@ MapperRegistry::MapperRegistry() {
   RegisterMapper(new CursorMapper());
   RegisterMapper(new AndConditionMapper());
   RegisterMapper(new BorderStylerMapper());
+  RegisterMapper(new CheckedConditionMapper());
   RegisterMapper(new ClickStateConditionMapper());
   RegisterMapper(new CursorStylerMapper());
   RegisterMapper(new FocusConditionMapper());
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
new file mode 100644
index 00000000..c4c8ad38
--- /dev/null
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -0,0 +1,22 @@
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/mapper/style/CheckedConditionMapper.h"
+#include "cru/ui/style/Condition.h"
+#include "cru/xml/XmlNode.h"
+
+namespace cru::ui::mapper::style {
+bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
+  return node->GetTag().CaseInsensitiveEqual(u"CheckedCondition");
+}
+
+ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
+    xml::XmlElementNode* node) {
+  auto value = node->GetAttributeCaseInsensitive(u"value");
+  if (value.CaseInsensitiveEqual(u"true")) {
+    return ui::style::CheckedCondition::Create(true);
+  } else if (value.CaseInsensitiveEqual(u"false")) {
+    return ui::style::CheckedCondition::Create(false);
+  } else {
+    throw Exception(u"Invalid value for CheckedCondition: " + value);
+  }
+}
+}  // namespace cru::ui::mapper::style