From d9a3b8c14b9ab1bc591ca7c373daaf7141d2d098 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 24 Feb 2022 15:40:46 +0800 Subject: ... --- .../ui/mapper/style/PreferredSizeStylerMapper.h | 26 ++++++++++++++++++++++ include/cru/ui/style/Styler.h | 21 +++++++++++++++++ src/ui/CMakeLists.txt | 1 + src/ui/mapper/MapperRegistry.cpp | 2 ++ src/ui/mapper/style/PreferredSizeStylerMapper.cpp | 26 ++++++++++++++++++++++ src/ui/style/Styler.cpp | 4 ++++ 6 files changed, 80 insertions(+) create mode 100644 include/cru/ui/mapper/style/PreferredSizeStylerMapper.h create mode 100644 src/ui/mapper/style/PreferredSizeStylerMapper.cpp diff --git a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h new file mode 100644 index 00000000..ac52240d --- /dev/null +++ b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h @@ -0,0 +1,26 @@ +#pragma once +#include "../Mapper.h" +#include "cru/ui/mapper/style/IStylerMapper.h" +#include "cru/ui/style/Styler.h" + +namespace cru::ui::mapper::style { +class CRU_UI_API PreferredSizeStylerMapper + : public BasicPtrMapper, + public virtual IStylerMapper { + public: + CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(PreferredSizeStylerMapper) + + public: + bool SupportMapFromXml() override { return true; } + bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; + + ClonablePtr MapStylerFromXml( + xml::XmlElementNode* node) override { + return MapFromXml(node); + } + + protected: + ClonablePtr DoMapFromXml( + xml::XmlElementNode* node) override; +}; +} // namespace cru::ui::mapper::style diff --git a/include/cru/ui/style/Styler.h b/include/cru/ui/style/Styler.h index 29c19975..4759c2ea 100644 --- a/include/cru/ui/style/Styler.h +++ b/include/cru/ui/style/Styler.h @@ -3,6 +3,7 @@ #include "ApplyBorderStyleInfo.h" #include "cru/common/ClonablePtr.h" #include "cru/platform/gui/Cursor.h" +#include "cru/ui/render/MeasureRequirement.h" #include #include @@ -91,4 +92,24 @@ class CRU_UI_API CursorStyler : public Styler { private: std::shared_ptr cursor_; }; + +class CRU_UI_API PreferredSizeStyler : public Styler { + public: + static ClonablePtr Create(render::MeasureSize size) { + return ClonablePtr(new PreferredSizeStyler(size)); + } + + explicit PreferredSizeStyler(render::MeasureSize size) : size_(size) {} + + void Apply(controls::Control* control) const override; + + PreferredSizeStyler* Clone() const override { + return new PreferredSizeStyler(size_); + } + + render::MeasureSize GetPreferredSize() const { return size_; } + + private: + render::MeasureSize size_; +}; } // namespace cru::ui::style diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 84f67407..2e3cd547 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -46,6 +46,7 @@ add_library(cru_ui SHARED mapper/style/HoverConditionMapper.cpp mapper/style/NoConditionMapper.cpp mapper/style/OrConditionMapper.cpp + mapper/style/PreferredSizeStylerMapper.cpp mapper/style/StyleRuleMapper.cpp mapper/style/StyleRuleSetMapper.cpp render/BorderRenderObject.cpp diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp index afbbc8b9..b70418ef 100644 --- a/src/ui/mapper/MapperRegistry.cpp +++ b/src/ui/mapper/MapperRegistry.cpp @@ -17,6 +17,7 @@ #include "cru/ui/mapper/style/HoverConditionMapper.h" #include "cru/ui/mapper/style/NoConditionMapper.h" #include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/ui/mapper/style/PreferredSizeStylerMapper.h" #include "cru/ui/mapper/style/StyleRuleMapper.h" #include "cru/ui/mapper/style/StyleRuleSetMapper.h" @@ -47,6 +48,7 @@ MapperRegistry::MapperRegistry() { RegisterMapper(new HoverConditionMapper()); RegisterMapper(new NoConditionMapper()); RegisterMapper(new OrConditionMapper()); + RegisterMapper(new PreferredSizeStylerMapper()); RegisterMapper(new StyleRuleMapper()); RegisterMapper(new StyleRuleSetMapper()); } diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp new file mode 100644 index 00000000..b4382c19 --- /dev/null +++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp @@ -0,0 +1,26 @@ +#include "cru/ui/mapper/style/PreferredSizeStylerMapper.h" +#include "cru/ui/render/MeasureRequirement.h" +#include "cru/ui/style/Styler.h" + +namespace cru::ui::mapper::style { +bool PreferredSizeStylerMapper::XmlElementIsOfThisType( + xml::XmlElementNode* node) { + return node->GetTag().CaseInsensitiveEqual(u"PreferredSizeStyler"); +} + +ClonablePtr +PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) { + render::MeasureSize size; + auto width_attribute = node->GetOptionalAttributeCaseInsensitive(u"width"); + if (width_attribute) { + size.width = width_attribute->ParseToFloat(); + } + + auto height_attribute = node->GetOptionalAttributeCaseInsensitive(u"height"); + if (height_attribute) { + size.height = height_attribute->ParseToFloat(); + } + + return ui::style::PreferredSizeStyler::Create(size); +} +} // namespace cru::ui::mapper::style diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp index 72e522e0..7085fd3e 100644 --- a/src/ui/style/Styler.cpp +++ b/src/ui/style/Styler.cpp @@ -26,4 +26,8 @@ ClonablePtr CursorStyler::Create( void CursorStyler::Apply(controls::Control *control) const { control->SetCursor(cursor_); } + +void PreferredSizeStyler::Apply(controls::Control *control) const { + control->SetPreferredSize(size_); +} } // namespace cru::ui::style -- cgit v1.2.3