From 24e1dc8723aea1e46a3aa15794747f3fa52f8eca Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 24 Jan 2022 22:14:37 +0800 Subject: ... --- src/ui/mapper/MapperRegistry.cpp | 41 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/ui/mapper/MapperRegistry.cpp') diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp index d7131e33..a9c53129 100644 --- a/src/ui/mapper/MapperRegistry.cpp +++ b/src/ui/mapper/MapperRegistry.cpp @@ -11,6 +11,7 @@ #include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" #include "cru/ui/mapper/style/CursorStylerMapper.hpp" #include "cru/ui/mapper/style/FocusConditionMapper.hpp" +#include "cru/ui/mapper/style/HoverConditionMapper.hpp" #include "cru/ui/mapper/style/NoConditionMapper.hpp" #include "cru/ui/mapper/style/OrConditionMapper.hpp" #include "cru/ui/mapper/style/StyleRuleMapper.hpp" @@ -19,31 +20,31 @@ namespace cru::ui::mapper { MapperRegistry *MapperRegistry::GetInstance() { static MapperRegistry instance; + return &instance; +} +MapperRegistry::MapperRegistry() { using namespace style; - instance.RegisterMapper(new CornerRadiusMapper()); - instance.RegisterMapper(new PointMapper()); - instance.RegisterMapper(new SizeMapper()); - instance.RegisterMapper(new ThicknessMapper()); - instance.RegisterMapper(new BorderStyleMapper()); - instance.RegisterMapper(new ColorMapper()); - instance.RegisterMapper(new CursorMapper()); - instance.RegisterMapper(new AndConditionMapper()); - instance.RegisterMapper(new BorderStylerMapper()); - instance.RegisterMapper(new ClickStateConditionMapper()); - instance.RegisterMapper(new CursorStylerMapper()); - instance.RegisterMapper(new FocusConditionMapper()); - instance.RegisterMapper(new NoConditionMapper()); - instance.RegisterMapper(new OrConditionMapper()); - instance.RegisterMapper(new StyleRuleMapper()); - instance.RegisterMapper(new StyleRuleSetMapper()); - - return &instance; + RegisterMapper(new CornerRadiusMapper()); + RegisterMapper(new PointMapper()); + RegisterMapper(new SizeMapper()); + RegisterMapper(new ThicknessMapper()); + RegisterMapper(new BorderStyleMapper()); + RegisterMapper(new ColorMapper()); + RegisterMapper(new CursorMapper()); + RegisterMapper(new AndConditionMapper()); + RegisterMapper(new BorderStylerMapper()); + RegisterMapper(new ClickStateConditionMapper()); + RegisterMapper(new CursorStylerMapper()); + RegisterMapper(new FocusConditionMapper()); + RegisterMapper(new HoverConditionMapper()); + RegisterMapper(new NoConditionMapper()); + RegisterMapper(new OrConditionMapper()); + RegisterMapper(new StyleRuleMapper()); + RegisterMapper(new StyleRuleSetMapper()); } -MapperRegistry::MapperRegistry() {} - MapperRegistry::~MapperRegistry() { for (auto mapper : mapper_list_) { delete mapper; -- cgit v1.2.3