From 72402c09d45b696cd58a65b4a141a804e1cd9371 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 24 Jan 2022 20:26:58 +0800 Subject: ... --- include/cru/ui/mapper/BorderStyleMapper.hpp | 2 +- include/cru/ui/mapper/ColorMapper.hpp | 2 +- .../ui/mapper/style/ClickStateConditionMapper.hpp | 2 +- .../cru/ui/mapper/style/FocusConditionMapper.hpp | 5 +++-- include/cru/ui/mapper/style/IConditionMapper.hpp | 2 +- include/cru/ui/mapper/style/IStylerMapper.hpp | 2 +- include/cru/ui/mapper/style/NoConditionMapper.hpp | 5 +++-- include/cru/ui/mapper/style/StyleRuleMapper.hpp | 20 ++++++++++++++++++++ include/cru/ui/mapper/style/StyleRuleSetMapper.hpp | 21 +++++++++++++++++++++ include/cru/ui/style/StyleRule.hpp | 7 +++++++ include/cru/ui/style/Styler.hpp | 5 +++++ 11 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 include/cru/ui/mapper/style/StyleRuleMapper.hpp create mode 100644 include/cru/ui/mapper/style/StyleRuleSetMapper.hpp (limited to 'include/cru/ui') diff --git a/include/cru/ui/mapper/BorderStyleMapper.hpp b/include/cru/ui/mapper/BorderStyleMapper.hpp index 4d9ae774..7a574f38 100644 --- a/include/cru/ui/mapper/BorderStyleMapper.hpp +++ b/include/cru/ui/mapper/BorderStyleMapper.hpp @@ -5,7 +5,7 @@ namespace cru::ui::mapper { class CRU_UI_API BorderStyleMapper - : BasicMapper { + : public BasicMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(BorderStyleMapper) diff --git a/include/cru/ui/mapper/ColorMapper.hpp b/include/cru/ui/mapper/ColorMapper.hpp index 668a4fc2..d96ca74b 100644 --- a/include/cru/ui/mapper/ColorMapper.hpp +++ b/include/cru/ui/mapper/ColorMapper.hpp @@ -3,7 +3,7 @@ #include "cru/xml/XmlNode.hpp" namespace cru::ui::mapper { -class ColorMapper : public BasicMapper { +class CRU_UI_API ColorMapper : public BasicMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(ColorMapper) diff --git a/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp b/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp index f60a27a1..2fea5353 100644 --- a/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp +++ b/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp @@ -4,7 +4,7 @@ #include "cru/ui/style/Condition.hpp" namespace cru::ui::mapper::style { -class ClickStateConditionMapper +class CRU_UI_API ClickStateConditionMapper : public BasicPtrMapper, public IConditionMapper { public: diff --git a/include/cru/ui/mapper/style/FocusConditionMapper.hpp b/include/cru/ui/mapper/style/FocusConditionMapper.hpp index 974a6739..00809850 100644 --- a/include/cru/ui/mapper/style/FocusConditionMapper.hpp +++ b/include/cru/ui/mapper/style/FocusConditionMapper.hpp @@ -4,8 +4,9 @@ #include "cru/ui/style/Condition.hpp" namespace cru::ui::mapper::style { -class FocusConditionMapper : public BasicPtrMapper, - public virtual IConditionMapper { +class CRU_UI_API FocusConditionMapper + : public BasicPtrMapper, + public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(FocusConditionMapper) diff --git a/include/cru/ui/mapper/style/IConditionMapper.hpp b/include/cru/ui/mapper/style/IConditionMapper.hpp index f5d7ad1e..3fa7d10a 100644 --- a/include/cru/ui/mapper/style/IConditionMapper.hpp +++ b/include/cru/ui/mapper/style/IConditionMapper.hpp @@ -6,7 +6,7 @@ #include "cru/xml/XmlNode.hpp" namespace cru::ui::mapper::style { -struct IConditionMapper : virtual Interface { +struct CRU_UI_API IConditionMapper : virtual Interface { bool XmlElementIsOfThisType(xml::XmlElementNode* node) { return dynamic_cast(this)->XmlElementIsOfThisType(node); } diff --git a/include/cru/ui/mapper/style/IStylerMapper.hpp b/include/cru/ui/mapper/style/IStylerMapper.hpp index 03ee4289..d00f39be 100644 --- a/include/cru/ui/mapper/style/IStylerMapper.hpp +++ b/include/cru/ui/mapper/style/IStylerMapper.hpp @@ -6,7 +6,7 @@ #include "cru/xml/XmlNode.hpp" namespace cru::ui::mapper::style { -struct IStylerMapper : virtual Interface { +struct CRU_UI_API IStylerMapper : virtual Interface { bool XmlElementIsOfThisType(xml::XmlElementNode* node) { return dynamic_cast(this)->XmlElementIsOfThisType(node); } diff --git a/include/cru/ui/mapper/style/NoConditionMapper.hpp b/include/cru/ui/mapper/style/NoConditionMapper.hpp index 79985e89..ed3a9699 100644 --- a/include/cru/ui/mapper/style/NoConditionMapper.hpp +++ b/include/cru/ui/mapper/style/NoConditionMapper.hpp @@ -7,8 +7,9 @@ #include "cru/xml/XmlNode.hpp" namespace cru::ui::mapper::style { -class NoConditionMapper : public BasicPtrMapper, - public virtual IConditionMapper { +class CRU_UI_API NoConditionMapper + : public BasicPtrMapper, + public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(NoConditionMapper) diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.hpp b/include/cru/ui/mapper/style/StyleRuleMapper.hpp new file mode 100644 index 00000000..ce5ccf00 --- /dev/null +++ b/include/cru/ui/mapper/style/StyleRuleMapper.hpp @@ -0,0 +1,20 @@ +#pragma once +#include "../Mapper.hpp" +#include "cru/common/ClonablePtr.hpp" +#include "cru/ui/style/StyleRule.hpp" +#include "cru/xml/XmlNode.hpp" + +namespace cru::ui::mapper::style { +class CRU_UI_API StyleRuleMapper : public BasicPtrMapper { + public: + CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleMapper) + + public: + bool SupportMapFromXml() override { return true; } + bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; + + protected: + ClonablePtr DoMapFromXml( + xml::XmlElementNode* node) override; +}; +} // namespace cru::ui::mapper::style diff --git a/include/cru/ui/mapper/style/StyleRuleSetMapper.hpp b/include/cru/ui/mapper/style/StyleRuleSetMapper.hpp new file mode 100644 index 00000000..66b95f4a --- /dev/null +++ b/include/cru/ui/mapper/style/StyleRuleSetMapper.hpp @@ -0,0 +1,21 @@ +#pragma once +#include +#include "../../style/StyleRuleSet.hpp" +#include "../Mapper.hpp" + +namespace cru::ui::mapper::style { +class CRU_UI_API StyleRuleSetMapper + : public BasicRefMapper { + public: + CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleSetMapper) + + public: + bool SupportMapFromXml() override { return true; } + bool XmlElementIsOfThisType(xml::XmlElementNode* node) override; + + protected: + std::shared_ptr DoMapFromXml( + xml::XmlElementNode* node) override; +}; +; +} // namespace cru::ui::mapper::style diff --git a/include/cru/ui/style/StyleRule.hpp b/include/cru/ui/style/StyleRule.hpp index e6035784..743aa759 100644 --- a/include/cru/ui/style/StyleRule.hpp +++ b/include/cru/ui/style/StyleRule.hpp @@ -10,6 +10,13 @@ namespace cru::ui::style { class StyleRule : public Object { public: + static ClonablePtr Create(ClonablePtr condition, + ClonablePtr styler, + String name = {}) { + return ClonablePtr(new StyleRule( + std::move(condition), std::move(styler), std::move(name))); + } + StyleRule(ClonablePtr condition, ClonablePtr styler, String name = {}); diff --git a/include/cru/ui/style/Styler.hpp b/include/cru/ui/style/Styler.hpp index 721a3bfd..3bf0b027 100644 --- a/include/cru/ui/style/Styler.hpp +++ b/include/cru/ui/style/Styler.hpp @@ -25,6 +25,11 @@ class CompoundStyler : public Styler { new CompoundStyler(std::vector>{std::move(s)...})); } + static ClonablePtr Create( + std::vector> stylers) { + return ClonablePtr(new CompoundStyler(std::move(stylers))); + } + explicit CompoundStyler(std::vector> stylers) : stylers_(std::move(stylers)) {} -- cgit v1.2.3