From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- 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 ++++----- 15 files changed, 89 insertions(+), 89 deletions(-) (limited to 'src/ui/controls') 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) { -- cgit v1.2.3