From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- src/ui/Helper.cpp | 6 +- src/ui/Helper.h | 16 ++++ src/ui/Helper.hpp | 16 ---- src/ui/ThemeManager.cpp | 22 ++--- src/ui/components/Component.cpp | 2 +- src/ui/components/Menu.cpp | 20 ++-- src/ui/controls/Button.cpp | 16 ++-- src/ui/controls/Container.cpp | 8 +- src/ui/controls/ContentControl.cpp | 2 +- src/ui/controls/Control.cpp | 18 ++-- src/ui/controls/FlexLayout.cpp | 4 +- src/ui/controls/LayoutControl.cpp | 4 +- src/ui/controls/NoChildControl.cpp | 2 +- src/ui/controls/Popup.cpp | 10 +- src/ui/controls/RootControl.cpp | 18 ++-- src/ui/controls/ScrollView.cpp | 6 +- src/ui/controls/StackLayout.cpp | 4 +- src/ui/controls/TextBlock.cpp | 10 +- src/ui/controls/TextBox.cpp | 16 ++-- src/ui/controls/TextHostControlService.cpp | 46 ++++----- src/ui/controls/Window.cpp | 14 +-- src/ui/events/MouseEventArgs.cpp | 8 +- src/ui/helper/ClickDetector.cpp | 6 +- src/ui/helper/ShortcutHub.cpp | 8 +- src/ui/host/LayoutPaintCycler.cpp | 8 +- src/ui/host/RoutedEventDispatch.h | 110 ++++++++++++++++++++++ src/ui/host/RoutedEventDispatch.hpp | 110 ---------------------- src/ui/host/WindowHost.cpp | 26 ++--- src/ui/mapper/BorderStyleMapper.cpp | 16 ++-- src/ui/mapper/BrushMapper.cpp | 16 ++-- src/ui/mapper/ColorMapper.cpp | 2 +- src/ui/mapper/CornerRadiusMapper.cpp | 6 +- src/ui/mapper/CursorMapper.cpp | 10 +- src/ui/mapper/FontMapper.cpp | 6 +- src/ui/mapper/Mapper.cpp | 2 +- src/ui/mapper/MapperRegistry.cpp | 40 ++++---- src/ui/mapper/PointMapper.cpp | 2 +- src/ui/mapper/SizeMapper.cpp | 2 +- src/ui/mapper/ThicknessMapper.cpp | 4 +- src/ui/mapper/style/AndConditionMapper.cpp | 12 +-- src/ui/mapper/style/BorderStylerMapper.cpp | 12 +-- src/ui/mapper/style/ClickStateConditionMapper.cpp | 10 +- src/ui/mapper/style/CursorStylerMapper.cpp | 10 +- src/ui/mapper/style/FocusConditionMapper.cpp | 8 +- src/ui/mapper/style/HoverConditionMapper.cpp | 6 +- src/ui/mapper/style/NoConditionMapper.cpp | 6 +- src/ui/mapper/style/OrConditionMapper.cpp | 12 +-- src/ui/mapper/style/StyleRuleMapper.cpp | 16 ++-- src/ui/mapper/style/StyleRuleSetMapper.cpp | 8 +- src/ui/render/BorderRenderObject.cpp | 20 ++-- src/ui/render/CanvasRenderObject.cpp | 2 +- src/ui/render/FlexLayoutRenderObject.cpp | 12 +-- src/ui/render/LayoutHelper.cpp | 4 +- src/ui/render/RenderObject.cpp | 16 ++-- src/ui/render/ScrollBar.cpp | 34 +++---- src/ui/render/ScrollRenderObject.cpp | 12 +-- src/ui/render/StackLayoutRenderObject.cpp | 8 +- src/ui/render/TextRenderObject.cpp | 16 ++-- src/ui/style/Condition.cpp | 12 +-- src/ui/style/StyleRule.cpp | 2 +- src/ui/style/StyleRuleSet.cpp | 6 +- src/ui/style/Styler.cpp | 16 ++-- 62 files changed, 451 insertions(+), 451 deletions(-) create mode 100644 src/ui/Helper.h delete mode 100644 src/ui/Helper.hpp create mode 100644 src/ui/host/RoutedEventDispatch.h delete mode 100644 src/ui/host/RoutedEventDispatch.hpp (limited to 'src/ui') diff --git a/src/ui/Helper.cpp b/src/ui/Helper.cpp index a5ab3a72..abfd001b 100644 --- a/src/ui/Helper.cpp +++ b/src/ui/Helper.cpp @@ -1,7 +1,7 @@ -#include "Helper.hpp" +#include "Helper.h" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/gui/UiApplication.h" namespace cru::ui { using cru::platform::graphics::IGraphicsFactory; diff --git a/src/ui/Helper.h b/src/ui/Helper.h new file mode 100644 index 00000000..8bee72a6 --- /dev/null +++ b/src/ui/Helper.h @@ -0,0 +1,16 @@ +#pragma once +#include "cru/ui/Base.h" + +namespace cru::platform { +namespace graphics { +struct IGraphicsFactory; +} +namespace native { +struct IUiApplication; +} // namespace native +} // namespace cru::platform + +namespace cru::ui { +cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory(); +cru::platform::gui::IUiApplication* GetUiApplication(); +} // namespace cru::ui diff --git a/src/ui/Helper.hpp b/src/ui/Helper.hpp deleted file mode 100644 index 23d24b66..00000000 --- a/src/ui/Helper.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -#include "cru/ui/Base.hpp" - -namespace cru::platform { -namespace graphics { -struct IGraphicsFactory; -} -namespace native { -struct IUiApplication; -} // namespace native -} // namespace cru::platform - -namespace cru::ui { -cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory(); -cru::platform::gui::IUiApplication* GetUiApplication(); -} // namespace cru::ui diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index 528097ab..4649f70f 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -1,14 +1,14 @@ -#include "cru/ui/ThemeManager.hpp" - -#include "Helper.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/common/io/FileStream.hpp" -#include "cru/common/io/Resource.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" -#include "cru/xml/XmlParser.hpp" +#include "cru/ui/ThemeManager.h" + +#include "Helper.h" +#include "cru/common/StringUtil.h" +#include "cru/common/io/FileStream.h" +#include "cru/common/io/Resource.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/style/StyleRuleSet.h" +#include "cru/xml/XmlParser.h" namespace cru::ui { ThemeManager* ThemeManager::GetInstance() { diff --git a/src/ui/components/Component.cpp b/src/ui/components/Component.cpp index 5b62ffc9..ddf65515 100644 --- a/src/ui/components/Component.cpp +++ b/src/ui/components/Component.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/components/Component.hpp" +#include "cru/ui/components/Component.h" namespace cru::ui::components { diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp index 22415cd3..873e7ce0 100644 --- a/src/ui/components/Menu.cpp +++ b/src/ui/components/Menu.cpp @@ -1,14 +1,14 @@ -#include "cru/ui/components/Menu.hpp" +#include "cru/ui/components/Menu.h" #include -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/controls/Button.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/FlexLayout.hpp" -#include "cru/ui/controls/TextBlock.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/platform/gui/Window.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/controls/Button.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/FlexLayout.h" +#include "cru/ui/controls/TextBlock.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::components { MenuItem::MenuItem() { diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp index 1f649819..e42bfae7 100644 --- a/src/ui/controls/Button.cpp +++ b/src/ui/controls/Button.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/Button.hpp" +#include "cru/ui/controls/Button.h" -#include "../Helper.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" +#include "../Helper.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/render/BorderRenderObject.h" namespace cru::ui::controls { Button::Button() : click_detector_(this) { diff --git a/src/ui/controls/Container.cpp b/src/ui/controls/Container.cpp index 30129f64..92ac3847 100644 --- a/src/ui/controls/Container.cpp +++ b/src/ui/controls/Container.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/controls/Container.hpp" +#include "cru/ui/controls/Container.h" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/render/BorderRenderObject.h" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::controls { Container::Container() { diff --git a/src/ui/controls/ContentControl.cpp b/src/ui/controls/ContentControl.cpp index 8c6f0b00..8b421e09 100644 --- a/src/ui/controls/ContentControl.cpp +++ b/src/ui/controls/ContentControl.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/controls/ContentControl.hpp" +#include "cru/ui/controls/ContentControl.h" namespace cru::ui::controls { Control* ContentControl::GetChild() const { diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp index 04199d1d..bda8cb35 100644 --- a/src/ui/controls/Control.cpp +++ b/src/ui/controls/Control.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/Control.hpp" - -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/RenderObject.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/ui/controls/Control.h" + +#include "cru/common/Base.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/RenderObject.h" +#include "cru/ui/style/StyleRuleSet.h" #include diff --git a/src/ui/controls/FlexLayout.cpp b/src/ui/controls/FlexLayout.cpp index e390241f..02ebb031 100644 --- a/src/ui/controls/FlexLayout.cpp +++ b/src/ui/controls/FlexLayout.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/FlexLayout.hpp" +#include "cru/ui/controls/FlexLayout.h" -#include "cru/ui/render/FlexLayoutRenderObject.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.h" namespace cru::ui::controls { using render::FlexLayoutRenderObject; diff --git a/src/ui/controls/LayoutControl.cpp b/src/ui/controls/LayoutControl.cpp index e5a38445..5c67bc86 100644 --- a/src/ui/controls/LayoutControl.cpp +++ b/src/ui/controls/LayoutControl.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/LayoutControl.hpp" +#include "cru/ui/controls/LayoutControl.h" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::controls { void LayoutControl::ClearChildren() { diff --git a/src/ui/controls/NoChildControl.cpp b/src/ui/controls/NoChildControl.cpp index c62c5819..29177828 100644 --- a/src/ui/controls/NoChildControl.cpp +++ b/src/ui/controls/NoChildControl.cpp @@ -1,3 +1,3 @@ -#include "cru/ui/controls/NoChildControl.hpp" +#include "cru/ui/controls/NoChildControl.h" namespace cru::ui::controls {} diff --git a/src/ui/controls/Popup.cpp b/src/ui/controls/Popup.cpp index b386165b..238ddbd4 100644 --- a/src/ui/controls/Popup.cpp +++ b/src/ui/controls/Popup.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/controls/Popup.hpp" +#include "cru/ui/controls/Popup.h" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/controls/RootControl.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/controls/RootControl.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/StackLayoutRenderObject.h" #include diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp index dbf037fc..ac4d4d6d 100644 --- a/src/ui/controls/RootControl.cpp +++ b/src/ui/controls/RootControl.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/controls/RootControl.hpp" - -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/Base.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/controls/RootControl.h" + +#include "cru/common/Base.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/Base.h" +#include "cru/ui/render/StackLayoutRenderObject.h" #include "gsl/pointers" #include diff --git a/src/ui/controls/ScrollView.cpp b/src/ui/controls/ScrollView.cpp index 66c1d620..e87ede4b 100644 --- a/src/ui/controls/ScrollView.cpp +++ b/src/ui/controls/ScrollView.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/controls/ScrollView.hpp" +#include "cru/ui/controls/ScrollView.h" -#include "cru/ui/render/RenderObject.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/RenderObject.h" +#include "cru/ui/render/ScrollRenderObject.h" #include diff --git a/src/ui/controls/StackLayout.cpp b/src/ui/controls/StackLayout.cpp index 667e6755..7e45a555 100644 --- a/src/ui/controls/StackLayout.cpp +++ b/src/ui/controls/StackLayout.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/controls/StackLayout.hpp" +#include "cru/ui/controls/StackLayout.h" #include -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.h" namespace cru::ui::controls { using render::StackLayoutRenderObject; diff --git a/src/ui/controls/TextBlock.cpp b/src/ui/controls/TextBlock.cpp index b4d327f3..80d9fe34 100644 --- a/src/ui/controls/TextBlock.cpp +++ b/src/ui/controls/TextBlock.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/controls/TextBlock.hpp" +#include "cru/ui/controls/TextBlock.h" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/render/CanvasRenderObject.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/render/CanvasRenderObject.h" +#include "cru/ui/render/StackLayoutRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" namespace cru::ui::controls { using render::TextRenderObject; diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp index a5c8480e..11b77e99 100644 --- a/src/ui/controls/TextBox.cpp +++ b/src/ui/controls/TextBox.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/controls/TextBox.hpp" - -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/render/BorderRenderObject.hpp" -#include "cru/ui/render/CanvasRenderObject.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/controls/TextBox.h" + +#include "cru/ui/ThemeManager.h" +#include "cru/ui/render/BorderRenderObject.h" +#include "cru/ui/render/CanvasRenderObject.h" +#include "cru/ui/render/ScrollRenderObject.h" +#include "cru/ui/render/StackLayoutRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" namespace cru::ui::controls { using render::BorderRenderObject; diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp index 0f136034..c537a86e 100644 --- a/src/ui/controls/TextHostControlService.cpp +++ b/src/ui/controls/TextHostControlService.cpp @@ -1,26 +1,26 @@ -#include "cru/ui/controls/TextHostControlService.hpp" - -#include "../Helper.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Logger.hpp" -#include "cru/common/String.hpp" -#include "cru/common/StringUtil.hpp" -#include "cru/platform/graphics/Font.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Clipboard.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/InputMethod.hpp" -#include "cru/platform/gui/Keyboard.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/components/Menu.hpp" -#include "cru/ui/events/UiEvents.hpp" -#include "cru/ui/helper/ShortcutHub.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" -#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/controls/TextHostControlService.h" + +#include "../Helper.h" +#include "cru/common/Base.h" +#include "cru/common/Logger.h" +#include "cru/common/String.h" +#include "cru/common/StringUtil.h" +#include "cru/platform/graphics/Font.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Clipboard.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/InputMethod.h" +#include "cru/platform/gui/Keyboard.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/components/Menu.h" +#include "cru/ui/events/UiEvents.h" +#include "cru/ui/helper/ShortcutHub.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/ScrollRenderObject.h" +#include "cru/ui/render/TextRenderObject.h" #include diff --git a/src/ui/controls/Window.cpp b/src/ui/controls/Window.cpp index 76203f22..998395f3 100644 --- a/src/ui/controls/Window.cpp +++ b/src/ui/controls/Window.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/controls/Window.hpp" +#include "cru/ui/controls/Window.h" -#include "cru/common/Base.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/ui/controls/RootControl.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/Base.hpp" -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/common/Base.h" +#include "cru/platform/gui/Base.h" +#include "cru/ui/controls/RootControl.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/Base.h" +#include "cru/ui/render/StackLayoutRenderObject.h" namespace cru::ui::controls { Window* Window::Create(Control* attached_control) { diff --git a/src/ui/events/MouseEventArgs.cpp b/src/ui/events/MouseEventArgs.cpp index 39424c65..cad860d7 100644 --- a/src/ui/events/MouseEventArgs.cpp +++ b/src/ui/events/MouseEventArgs.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/events/MouseEventArgs.hpp" +#include "cru/ui/events/MouseEventArgs.h" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/controls/Control.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/RenderObject.h" namespace cru::ui::events { Point MouseEventArgs::GetPoint(render::RenderObject* render_object) const { diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp index d8d51327..6d4f38c1 100644 --- a/src/ui/helper/ClickDetector.cpp +++ b/src/ui/helper/ClickDetector.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/helper/ClickDetector.hpp" +#include "cru/ui/helper/ClickDetector.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" #include diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp index c0b6c5d8..3df07409 100644 --- a/src/ui/helper/ShortcutHub.cpp +++ b/src/ui/helper/ShortcutHub.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/helper/ShortcutHub.hpp" +#include "cru/ui/helper/ShortcutHub.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/controls/Control.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/controls/Control.h" #include #include diff --git a/src/ui/host/LayoutPaintCycler.cpp b/src/ui/host/LayoutPaintCycler.cpp index fd581e00..7f8523d4 100644 --- a/src/ui/host/LayoutPaintCycler.cpp +++ b/src/ui/host/LayoutPaintCycler.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/host/LayoutPaintCycler.hpp" +#include "cru/ui/host/LayoutPaintCycler.h" #include -#include "../Helper.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/host/WindowHost.hpp" +#include "../Helper.h" +#include "cru/ui/Base.h" +#include "cru/ui/host/WindowHost.h" namespace cru::ui::host { LayoutPaintCycler::LayoutPaintCycler(WindowHost* host) : host_(host) { diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h new file mode 100644 index 00000000..ae1421ee --- /dev/null +++ b/src/ui/host/RoutedEventDispatch.h @@ -0,0 +1,110 @@ +#pragma once +#include "cru/common/Logger.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/controls/Control.h" + +#include + +namespace cru::ui { +// Dispatch the event. +// +// This will raise routed event of the control and its parent and parent's +// parent ... (until "last_receiver" if it's not nullptr) with appropriate args. +// +// First tunnel from top to bottom possibly stopped by "handled" flag in +// EventArgs. Second bubble from bottom to top possibly stopped by "handled" +// flag in EventArgs. Last direct to each control. +// +// Args is of type "EventArgs". The first init argument is "sender", which is +// automatically bound to each receiving control. The second init argument is +// "original_sender", which is unchanged. And "args" will be perfectly forwarded +// as the rest arguments. +template +void DispatchEvent( + const std::u16string_view& event_name, + controls::Control* const original_sender, + events::RoutedEvent* (controls::Control::*event_ptr)(), + controls::Control* const last_receiver, Args&&... args) { + CRU_UNUSED(event_name) + + if (original_sender == last_receiver) { + if constexpr (debug_flags::routed_event) + log::Debug( + "Routed event {} no need to dispatch (original_sender == " + "last_receiver). Original sender is {}.", + event_name, original_sender->GetControlType()); + return; + } + + std::vector receive_list; + + auto parent = original_sender; + while (parent != last_receiver) { + receive_list.push_back(parent); + parent = parent->GetParent(); + } + + if constexpr (debug_flags::routed_event) { + std::u16string log = u"Dispatch routed event "; + log += event_name; + log += u". Path (parent first): "; + auto i = receive_list.crbegin(); + const auto end = --receive_list.crend(); + for (; i != end; ++i) { + log += (*i)->GetControlType(); + log += u" -> "; + } + log += (*i)->GetControlType(); + log::Debug(log); + } + + auto handled = false; + + int count = 0; + + // tunnel + for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) { + count++; + EventArgs event_args(*i, original_sender, std::forward(args)...); + static_cast*>(((*i)->*event_ptr)()->Tunnel()) + ->Raise(event_args); + if (event_args.IsHandled()) { + handled = true; + if constexpr (debug_flags::routed_event) + log::Debug( + u"Routed event is short-circuit in TUNNEL at {}-st control (count " + u"from parent).", + count); + break; + } + } + + // bubble + if (!handled) { + for (auto i : receive_list) { + count--; + EventArgs event_args(i, original_sender, std::forward(args)...); + static_cast*>((i->*event_ptr)()->Bubble()) + ->Raise(event_args); + if (event_args.IsHandled()) { + if constexpr (debug_flags::routed_event) + log::Debug( + u"Routed event is short-circuit in BUBBLE at {}-st control " + u"(count from parent).", + count); + break; + } + } + } + + // direct + for (auto i : receive_list) { + EventArgs event_args(i, original_sender, std::forward(args)...); + static_cast*>((i->*event_ptr)()->Direct()) + ->Raise(event_args); + } + + if constexpr (debug_flags::routed_event) + log::Debug(u"Routed event dispatch finished."); +} +} // namespace cru::ui diff --git a/src/ui/host/RoutedEventDispatch.hpp b/src/ui/host/RoutedEventDispatch.hpp deleted file mode 100644 index 027ddbe4..00000000 --- a/src/ui/host/RoutedEventDispatch.hpp +++ /dev/null @@ -1,110 +0,0 @@ -#pragma once -#include "cru/common/Logger.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/controls/Control.hpp" - -#include - -namespace cru::ui { -// Dispatch the event. -// -// This will raise routed event of the control and its parent and parent's -// parent ... (until "last_receiver" if it's not nullptr) with appropriate args. -// -// First tunnel from top to bottom possibly stopped by "handled" flag in -// EventArgs. Second bubble from bottom to top possibly stopped by "handled" -// flag in EventArgs. Last direct to each control. -// -// Args is of type "EventArgs". The first init argument is "sender", which is -// automatically bound to each receiving control. The second init argument is -// "original_sender", which is unchanged. And "args" will be perfectly forwarded -// as the rest arguments. -template -void DispatchEvent( - const std::u16string_view& event_name, - controls::Control* const original_sender, - events::RoutedEvent* (controls::Control::*event_ptr)(), - controls::Control* const last_receiver, Args&&... args) { - CRU_UNUSED(event_name) - - if (original_sender == last_receiver) { - if constexpr (debug_flags::routed_event) - log::Debug( - "Routed event {} no need to dispatch (original_sender == " - "last_receiver). Original sender is {}.", - event_name, original_sender->GetControlType()); - return; - } - - std::vector receive_list; - - auto parent = original_sender; - while (parent != last_receiver) { - receive_list.push_back(parent); - parent = parent->GetParent(); - } - - if constexpr (debug_flags::routed_event) { - std::u16string log = u"Dispatch routed event "; - log += event_name; - log += u". Path (parent first): "; - auto i = receive_list.crbegin(); - const auto end = --receive_list.crend(); - for (; i != end; ++i) { - log += (*i)->GetControlType(); - log += u" -> "; - } - log += (*i)->GetControlType(); - log::Debug(log); - } - - auto handled = false; - - int count = 0; - - // tunnel - for (auto i = receive_list.crbegin(); i != receive_list.crend(); ++i) { - count++; - EventArgs event_args(*i, original_sender, std::forward(args)...); - static_cast*>(((*i)->*event_ptr)()->Tunnel()) - ->Raise(event_args); - if (event_args.IsHandled()) { - handled = true; - if constexpr (debug_flags::routed_event) - log::Debug( - u"Routed event is short-circuit in TUNNEL at {}-st control (count " - u"from parent).", - count); - break; - } - } - - // bubble - if (!handled) { - for (auto i : receive_list) { - count--; - EventArgs event_args(i, original_sender, std::forward(args)...); - static_cast*>((i->*event_ptr)()->Bubble()) - ->Raise(event_args); - if (event_args.IsHandled()) { - if constexpr (debug_flags::routed_event) - log::Debug( - u"Routed event is short-circuit in BUBBLE at {}-st control " - u"(count from parent).", - count); - break; - } - } - } - - // direct - for (auto i : receive_list) { - EventArgs event_args(i, original_sender, std::forward(args)...); - static_cast*>((i->*event_ptr)()->Direct()) - ->Raise(event_args); - } - - if constexpr (debug_flags::routed_event) - log::Debug(u"Routed event dispatch finished."); -} -} // namespace cru::ui diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp index 9766e85e..26d48f89 100644 --- a/src/ui/host/WindowHost.cpp +++ b/src/ui/host/WindowHost.cpp @@ -1,16 +1,16 @@ -#include "cru/ui/host/WindowHost.hpp" - -#include "RoutedEventDispatch.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/gui/InputMethod.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/platform/gui/Window.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/host/LayoutPaintCycler.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" -#include "cru/ui/render/RenderObject.hpp" +#include "cru/ui/host/WindowHost.h" + +#include "RoutedEventDispatch.h" +#include "cru/common/Base.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/gui/InputMethod.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/platform/gui/Window.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/host/LayoutPaintCycler.h" +#include "cru/ui/render/MeasureRequirement.h" +#include "cru/ui/render/RenderObject.h" #include #include diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 1209df07..8daa9d1b 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper { using namespace xml; diff --git a/src/ui/mapper/BrushMapper.cpp b/src/ui/mapper/BrushMapper.cpp index bfaef507..737508ce 100644 --- a/src/ui/mapper/BrushMapper.cpp +++ b/src/ui/mapper/BrushMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BrushMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/Color.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BrushMapper.h" +#include "../Helper.h" +#include "cru/platform/Color.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/xml/XmlNode.h" #include diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp index 063b2359..54359727 100644 --- a/src/ui/mapper/ColorMapper.cpp +++ b/src/ui/mapper/ColorMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/ColorMapper.hpp" +#include "cru/ui/mapper/ColorMapper.h" namespace cru::ui::mapper { bool ColorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp index 9c8855a3..673432e1 100644 --- a/src/ui/mapper/CornerRadiusMapper.cpp +++ b/src/ui/mapper/CornerRadiusMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool CornerRadiusMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp index ad9c2bbf..3a916fd1 100644 --- a/src/ui/mapper/CursorMapper.cpp +++ b/src/ui/mapper/CursorMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/CursorMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Exception.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/ui/mapper/CursorMapper.h" +#include "../Helper.h" +#include "cru/common/Exception.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" namespace cru::ui::mapper { using cru::platform::gui::ICursor; diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp index 26a17c5f..8f64d5aa 100644 --- a/src/ui/mapper/FontMapper.cpp +++ b/src/ui/mapper/FontMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/FontMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/graphics/Factory.hpp" +#include "cru/ui/mapper/FontMapper.h" +#include "../Helper.h" +#include "cru/platform/graphics/Factory.h" namespace cru::ui::mapper { bool FontMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/Mapper.cpp b/src/ui/mapper/Mapper.cpp index 93a83d8a..40653118 100644 --- a/src/ui/mapper/Mapper.cpp +++ b/src/ui/mapper/Mapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/Mapper.hpp" +#include "cru/ui/mapper/Mapper.h" #include diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp index 121a65e7..83105b9b 100644 --- a/src/ui/mapper/MapperRegistry.cpp +++ b/src/ui/mapper/MapperRegistry.cpp @@ -1,23 +1,23 @@ -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "cru/ui/mapper/BrushMapper.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/CursorMapper.hpp" -#include "cru/ui/mapper/FontMapper.hpp" -#include "cru/ui/mapper/PointMapper.hpp" -#include "cru/ui/mapper/SizeMapper.hpp" -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#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" -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "cru/ui/mapper/BrushMapper.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/CursorMapper.h" +#include "cru/ui/mapper/FontMapper.h" +#include "cru/ui/mapper/PointMapper.h" +#include "cru/ui/mapper/SizeMapper.h" +#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/ClickStateConditionMapper.h" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#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/StyleRuleMapper.h" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" namespace cru::ui::mapper { MapperRegistry *MapperRegistry::GetInstance() { diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp index efafc6ce..ca7729b4 100644 --- a/src/ui/mapper/PointMapper.cpp +++ b/src/ui/mapper/PointMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool PointMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp index dfc83cca..0fcf1c53 100644 --- a/src/ui/mapper/SizeMapper.cpp +++ b/src/ui/mapper/SizeMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/SizeMapper.hpp" +#include "cru/ui/mapper/SizeMapper.h" namespace cru::ui::mapper { bool SizeMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp index b72f952c..6ddd52ea 100644 --- a/src/ui/mapper/ThicknessMapper.cpp +++ b/src/ui/mapper/ThicknessMapper.cpp @@ -1,5 +1,5 @@ -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/ThicknessMapper.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper { bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp index e07e514c..dd8784d5 100644 --- a/src/ui/mapper/style/AndConditionMapper.cpp +++ b/src/ui/mapper/style/AndConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/AndConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp index 8a5df83d..95dd28ee 100644 --- a/src/ui/mapper/style/BorderStylerMapper.cpp +++ b/src/ui/mapper/style/BorderStylerMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/ui/style/Styler.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/BorderStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/ui/style/Styler.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { using cru::ui::style::ApplyBorderStyleInfo; diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp index 8e162a86..7c1200ef 100644 --- a/src/ui/mapper/style/ClickStateConditionMapper.cpp +++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/common/Exception.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/ClickStateConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/common/Exception.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { bool ClickStateConditionMapper::XmlElementIsOfThisType( diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp index c63d451c..103d9d82 100644 --- a/src/ui/mapper/style/CursorStylerMapper.cpp +++ b/src/ui/mapper/style/CursorStylerMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/CursorStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp index 46f9f2c7..5df4443d 100644 --- a/src/ui/mapper/style/FocusConditionMapper.cpp +++ b/src/ui/mapper/style/FocusConditionMapper.cpp @@ -1,7 +1,7 @@ -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/style/FocusConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp index b78c12e9..4f92e9f6 100644 --- a/src/ui/mapper/style/HoverConditionMapper.cpp +++ b/src/ui/mapper/style/HoverConditionMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/style/HoverConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/HoverConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp index 03aae69f..397162f1 100644 --- a/src/ui/mapper/style/NoConditionMapper.cpp +++ b/src/ui/mapper/style/NoConditionMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/style/NoConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/NoConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp index a91f5130..7b932dbc 100644 --- a/src/ui/mapper/style/OrConditionMapper.cpp +++ b/src/ui/mapper/style/OrConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/OrConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp index fea102ed..1ca45a6e 100644 --- a/src/ui/mapper/style/StyleRuleMapper.cpp +++ b/src/ui/mapper/style/StyleRuleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/style/StyleRuleMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/mapper/style/IStylerMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/StyleRuleMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/mapper/style/IStylerMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { using namespace ui::style; diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp index b9199d27..7552e25f 100644 --- a/src/ui/mapper/style/StyleRuleSetMapper.cpp +++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" #include -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp index 9b886348..61af27bc 100644 --- a/src/ui/render/BorderRenderObject.cpp +++ b/src/ui/render/BorderRenderObject.cpp @@ -1,13 +1,13 @@ -#include "cru/ui/render/BorderRenderObject.hpp" - -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/Geometry.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" +#include "cru/ui/render/BorderRenderObject.h" + +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/Geometry.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" #include diff --git a/src/ui/render/CanvasRenderObject.cpp b/src/ui/render/CanvasRenderObject.cpp index bf1155e1..985a2dae 100644 --- a/src/ui/render/CanvasRenderObject.cpp +++ b/src/ui/render/CanvasRenderObject.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/render/CanvasRenderObject.hpp" +#include "cru/ui/render/CanvasRenderObject.h" namespace cru::ui::render { CanvasRenderObject::CanvasRenderObject() : RenderObject(ChildMode::None) {} diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index 0e76995b..e4d16169 100644 --- a/src/ui/render/FlexLayoutRenderObject.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/render/FlexLayoutRenderObject.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.h" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/render/LayoutHelper.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/render/LayoutHelper.h" +#include "cru/ui/render/MeasureRequirement.h" #include #include diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp index 5854a945..d7f6df8a 100644 --- a/src/ui/render/LayoutHelper.cpp +++ b/src/ui/render/LayoutHelper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/render/LayoutHelper.hpp" +#include "cru/ui/render/LayoutHelper.h" -#include "cru/common/Logger.hpp" +#include "cru/common/Logger.h" namespace cru::ui::render { float CalculateAnchorByAlignment(Alignment alignment, float start_point, diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp index 75bf1380..00488425 100644 --- a/src/ui/render/RenderObject.cpp +++ b/src/ui/render/RenderObject.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/render/RenderObject.hpp" - -#include "cru/common/Logger.hpp" -#include "cru/platform/GraphicsBase.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/DebugFlags.hpp" -#include "cru/ui/host/WindowHost.hpp" +#include "cru/ui/render/RenderObject.h" + +#include "cru/common/Logger.h" +#include "cru/platform/GraphicsBase.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/DebugFlags.h" +#include "cru/ui/host/WindowHost.h" #include #include diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp index 37aebeaf..e3cc006b 100644 --- a/src/ui/render/ScrollBar.cpp +++ b/src/ui/render/ScrollBar.cpp @@ -1,20 +1,20 @@ -#include "cru/ui/render/ScrollBar.hpp" - -#include "../Helper.hpp" -#include "cru/common/Base.hpp" -#include "cru/platform/GraphicsBase.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/Geometry.hpp" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/platform/gui/Base.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/ThemeManager.hpp" -#include "cru/ui/events/UiEvents.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/host/WindowHost.hpp" -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/ScrollBar.h" + +#include "../Helper.h" +#include "cru/common/Base.h" +#include "cru/platform/GraphicsBase.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/Geometry.h" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/platform/gui/Base.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/ui/Base.h" +#include "cru/ui/ThemeManager.h" +#include "cru/ui/events/UiEvents.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/host/WindowHost.h" +#include "cru/ui/render/ScrollRenderObject.h" #include #include diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp index bd9b8559..2400cc11 100644 --- a/src/ui/render/ScrollRenderObject.cpp +++ b/src/ui/render/ScrollRenderObject.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/render/ScrollRenderObject.hpp" +#include "cru/ui/render/ScrollRenderObject.h" -#include "cru/platform/graphics/Painter.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/Base.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/render/ScrollBar.hpp" +#include "cru/platform/graphics/Painter.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/Base.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/render/ScrollBar.h" #include #include diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp index 1b6cc9fc..ea65fe02 100644 --- a/src/ui/render/StackLayoutRenderObject.cpp +++ b/src/ui/render/StackLayoutRenderObject.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.h" -#include "cru/common/Logger.hpp" -#include "cru/ui/render/LayoutHelper.hpp" -#include "cru/ui/render/MeasureRequirement.hpp" +#include "cru/common/Logger.h" +#include "cru/ui/render/LayoutHelper.h" +#include "cru/ui/render/MeasureRequirement.h" #include diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp index f7665beb..675bac3c 100644 --- a/src/ui/render/TextRenderObject.cpp +++ b/src/ui/render/TextRenderObject.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/render/TextRenderObject.hpp" - -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/platform/graphics/TextLayout.hpp" -#include "cru/platform/graphics/util/Painter.hpp" -#include "cru/ui/DebugFlags.hpp" +#include "cru/ui/render/TextRenderObject.h" + +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/platform/graphics/TextLayout.h" +#include "cru/platform/graphics/util/Painter.h" +#include "cru/ui/DebugFlags.h" #include #include diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp index f4866c04..b68fd0ee 100644 --- a/src/ui/style/Condition.cpp +++ b/src/ui/style/Condition.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/style/Condition.h" #include -#include "cru/common/ClonablePtr.hpp" -#include "cru/common/Event.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/IClickableControl.hpp" -#include "cru/ui/helper/ClickDetector.hpp" +#include "cru/common/ClonablePtr.h" +#include "cru/common/Event.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/IClickableControl.h" +#include "cru/ui/helper/ClickDetector.h" namespace cru::ui::style { CompoundCondition::CompoundCondition( diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp index 59096fb6..ce823537 100644 --- a/src/ui/style/StyleRule.cpp +++ b/src/ui/style/StyleRule.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/style/StyleRule.hpp" +#include "cru/ui/style/StyleRule.h" namespace cru::ui::style { StyleRule::StyleRule(ClonablePtr condition, diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp index 88109350..7352f69b 100644 --- a/src/ui/style/StyleRuleSet.cpp +++ b/src/ui/style/StyleRuleSet.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/style/StyleRuleSet.hpp" -#include "cru/common/Event.hpp" -#include "cru/ui/controls/Control.hpp" +#include "cru/ui/style/StyleRuleSet.h" +#include "cru/common/Event.h" +#include "cru/ui/controls/Control.h" #include "gsl/gsl_assert" #include diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp index da3a2247..72e522e0 100644 --- a/src/ui/style/Styler.cpp +++ b/src/ui/style/Styler.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/style/Styler.h" -#include "../Helper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" -#include "cru/ui/controls/Control.hpp" -#include "cru/ui/controls/IBorderControl.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" +#include "../Helper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" +#include "cru/ui/controls/Control.h" +#include "cru/ui/controls/IBorderControl.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" namespace cru::ui::style { BorderStyler::BorderStyler(ApplyBorderStyleInfo style) -- cgit v1.2.3