diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/CMakeLists.txt | 110 | ||||
-rw-r--r-- | src/ui/ClickDetector.cpp (renamed from src/ui/click_detector.cpp) | 4 | ||||
-rw-r--r-- | src/ui/ContentControl.cpp (renamed from src/ui/content_control.cpp) | 4 | ||||
-rw-r--r-- | src/ui/LayoutControl.cpp (renamed from src/ui/layout_control.cpp) | 4 | ||||
-rw-r--r-- | src/ui/NoChildControl.cpp (renamed from src/ui/no_child_control.cpp) | 2 | ||||
-rw-r--r-- | src/ui/RoutedEventDispatch.hpp (renamed from src/ui/routed_event_dispatch.hpp) | 4 | ||||
-rw-r--r-- | src/ui/UiHost.cpp (renamed from src/ui/ui_host.cpp) | 18 | ||||
-rw-r--r-- | src/ui/UiManager.cpp (renamed from src/ui/ui_manager.cpp) | 12 | ||||
-rw-r--r-- | src/ui/control.cpp | 12 | ||||
-rw-r--r-- | src/ui/controls/FlexLayout.cpp (renamed from src/ui/controls/flex_layout.cpp) | 4 | ||||
-rw-r--r-- | src/ui/controls/StackLayout.cpp (renamed from src/ui/controls/stack_layout.cpp) | 4 | ||||
-rw-r--r-- | src/ui/controls/TextBlock.cpp (renamed from src/ui/controls/text_block.cpp) | 12 | ||||
-rw-r--r-- | src/ui/controls/TextBox.cpp (renamed from src/ui/controls/text_box.cpp) | 16 | ||||
-rw-r--r-- | src/ui/controls/TextControlService.hpp (renamed from src/ui/controls/text_control_service.hpp) | 18 | ||||
-rw-r--r-- | src/ui/controls/button.cpp | 16 | ||||
-rw-r--r-- | src/ui/controls/container.cpp | 6 | ||||
-rw-r--r-- | src/ui/helper.cpp | 6 | ||||
-rw-r--r-- | src/ui/helper.hpp | 2 | ||||
-rw-r--r-- | src/ui/render/BorderRenderObject.cpp (renamed from src/ui/render/border_render_object.cpp) | 12 | ||||
-rw-r--r-- | src/ui/render/CanvasRenderObject.cpp (renamed from src/ui/render/canvas_render_object.cpp) | 4 | ||||
-rw-r--r-- | src/ui/render/FlexLayoutRenderObject.cpp (renamed from src/ui/render/flex_layout_render_object.cpp) | 4 | ||||
-rw-r--r-- | src/ui/render/LayoutUtility.cpp (renamed from src/ui/render/layout_utility.cpp) | 2 | ||||
-rw-r--r-- | src/ui/render/RenderObject.cpp (renamed from src/ui/render/render_object.cpp) | 6 | ||||
-rw-r--r-- | src/ui/render/ScrollRenderObject.cpp | 1 | ||||
-rw-r--r-- | src/ui/render/StackLayoutRenderObject.cpp (renamed from src/ui/render/stack_layout_render_object.cpp) | 2 | ||||
-rw-r--r-- | src/ui/render/TextRenderObject.cpp (renamed from src/ui/render/text_render_object.cpp) | 10 | ||||
-rw-r--r-- | src/ui/render/WindowRenderObject.cpp (renamed from src/ui/render/window_render_object.cpp) | 8 | ||||
-rw-r--r-- | src/ui/render/scroll_render_object.cpp | 1 | ||||
-rw-r--r-- | src/ui/window.cpp | 6 |
29 files changed, 155 insertions, 155 deletions
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 777e4fbc..f37982e9 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,63 +1,63 @@ set(CRU_UI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/ui) add_library(cru_ui STATIC - helper.hpp - routed_event_dispatch.hpp + Helper.hpp + RoutedEventDispatch.hpp - click_detector.cpp - content_control.cpp - control.cpp - helper.cpp - layout_control.cpp - no_child_control.cpp - ui_host.cpp - ui_manager.cpp - window.cpp - controls/button.cpp - controls/container.cpp - controls/flex_layout.cpp - controls/stack_layout.cpp - controls/text_block.cpp - controls/text_box.cpp - controls/text_control_service.hpp - render/border_render_object.cpp - render/canvas_render_object.cpp - render/flex_layout_render_object.cpp - render/layout_utility.cpp - render/render_object.cpp - render/scroll_render_object.cpp - render/stack_layout_render_object.cpp - render/text_render_object.cpp - render/window_render_object.cpp + ClickDetector.cpp + ContentControl.cpp + Control.cpp + Helper.cpp + LayoutControl.cpp + NoChildControl.cpp + UiHost.cpp + UiManager.cpp + Window.cpp + controls/Button.cpp + controls/Container.cpp + controls/FlexLayout.cpp + controls/StackLayout.cpp + controls/TextBlock.cpp + controls/TextBox.cpp + controls/TextControlService.hpp + render/BorderRenderObject.cpp + render/CanvasRenderObject.cpp + render/FlexLayoutRenderObject.cpp + render/LayoutUtility.cpp + render/RenderObject.cpp + render/ScrollRenderObject.cpp + render/StackLayoutRenderObject.cpp + render/TextRenderObject.cpp + render/WindowRenderObject.cpp ) target_sources(cru_ui PUBLIC - ${CRU_UI_INCLUDE_DIR}/base.hpp - ${CRU_UI_INCLUDE_DIR}/click_detector.hpp - ${CRU_UI_INCLUDE_DIR}/content_control.hpp - ${CRU_UI_INCLUDE_DIR}/control.hpp - ${CRU_UI_INCLUDE_DIR}/layout_control.hpp - ${CRU_UI_INCLUDE_DIR}/no_child_control.hpp - ${CRU_UI_INCLUDE_DIR}/ui_event.hpp - ${CRU_UI_INCLUDE_DIR}/ui_host.hpp - ${CRU_UI_INCLUDE_DIR}/ui_manager.hpp - ${CRU_UI_INCLUDE_DIR}/window.hpp - ${CRU_UI_INCLUDE_DIR}/controls/base.hpp - ${CRU_UI_INCLUDE_DIR}/controls/button.hpp - ${CRU_UI_INCLUDE_DIR}/controls/container.hpp - ${CRU_UI_INCLUDE_DIR}/controls/flex_layout.hpp - ${CRU_UI_INCLUDE_DIR}/controls/stack_layout.hpp - ${CRU_UI_INCLUDE_DIR}/controls/text_box.hpp - ${CRU_UI_INCLUDE_DIR}/controls/text_block.hpp - ${CRU_UI_INCLUDE_DIR}/render/base.hpp - ${CRU_UI_INCLUDE_DIR}/render/border_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/canvas_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/flex_layout_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/layout_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/layout_utility.hpp - ${CRU_UI_INCLUDE_DIR}/render/render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/scroll_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/stack_layout_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/text_render_object.hpp - ${CRU_UI_INCLUDE_DIR}/render/window_render_object.hpp + ${CRU_UI_INCLUDE_DIR}/Base.hpp + ${CRU_UI_INCLUDE_DIR}/ClickDetector.hpp + ${CRU_UI_INCLUDE_DIR}/ContentControl.hpp + ${CRU_UI_INCLUDE_DIR}/Control.hpp + ${CRU_UI_INCLUDE_DIR}/LayoutControl.hpp + ${CRU_UI_INCLUDE_DIR}/NoChildControl.hpp + ${CRU_UI_INCLUDE_DIR}/UiEvent.hpp + ${CRU_UI_INCLUDE_DIR}/UiHost.hpp + ${CRU_UI_INCLUDE_DIR}/UiManager.hpp + ${CRU_UI_INCLUDE_DIR}/Window.hpp + ${CRU_UI_INCLUDE_DIR}/controls/Base.hpp + ${CRU_UI_INCLUDE_DIR}/controls/Button.hpp + ${CRU_UI_INCLUDE_DIR}/controls/Container.hpp + ${CRU_UI_INCLUDE_DIR}/controls/FlexLayout.hpp + ${CRU_UI_INCLUDE_DIR}/controls/StackLayout.hpp + ${CRU_UI_INCLUDE_DIR}/controls/TextBox.hpp + ${CRU_UI_INCLUDE_DIR}/controls/TextBlock.hpp + ${CRU_UI_INCLUDE_DIR}/render/Base.hpp + ${CRU_UI_INCLUDE_DIR}/render/BorderRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/CanvasRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/FlexLayoutRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/LayoutRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/LayoutUtility.hpp + ${CRU_UI_INCLUDE_DIR}/render/RenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/ScrollRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/StackLayoutRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/TextRenderObject.hpp + ${CRU_UI_INCLUDE_DIR}/render/WindowRenderObject.hpp ) target_link_libraries(cru_ui PUBLIC cru_platform_native) diff --git a/src/ui/click_detector.cpp b/src/ui/ClickDetector.cpp index 3f342a31..e873efd4 100644 --- a/src/ui/click_detector.cpp +++ b/src/ui/ClickDetector.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/click_detector.hpp" +#include "cru/ui/ClickDetector.hpp" -#include "cru/common/logger.hpp" +#include "cru/common/Logger.hpp" #include <optional> diff --git a/src/ui/content_control.cpp b/src/ui/ContentControl.cpp index eb13f4cb..8d1a17d2 100644 --- a/src/ui/content_control.cpp +++ b/src/ui/ContentControl.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/content_control.hpp" +#include "cru/ui/ContentControl.hpp" -#include "cru/ui/window.hpp" +#include "cru/ui/Window.hpp" namespace cru::ui { ContentControl::ContentControl() diff --git a/src/ui/layout_control.cpp b/src/ui/LayoutControl.cpp index 1d5d1ede..4813566b 100644 --- a/src/ui/layout_control.cpp +++ b/src/ui/LayoutControl.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/layout_control.hpp" +#include "cru/ui/LayoutControl.hpp" -#include "cru/ui/window.hpp" +#include "cru/ui/Window.hpp" namespace cru::ui { LayoutControl::~LayoutControl() { diff --git a/src/ui/no_child_control.cpp b/src/ui/NoChildControl.cpp index 81299411..86861049 100644 --- a/src/ui/no_child_control.cpp +++ b/src/ui/NoChildControl.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/no_child_control.hpp" +#include "cru/ui/NoChildControl.hpp" namespace cru::ui { const std::vector<Control*> NoChildControl::empty_control_vector{}; diff --git a/src/ui/routed_event_dispatch.hpp b/src/ui/RoutedEventDispatch.hpp index dd55ce17..5ff21a74 100644 --- a/src/ui/routed_event_dispatch.hpp +++ b/src/ui/RoutedEventDispatch.hpp @@ -1,7 +1,7 @@ #pragma once -#include "cru/ui/control.hpp" +#include "cru/ui/Control.hpp" -#include "cru/common/logger.hpp" +#include "cru/common/Logger.hpp" #include <list> diff --git a/src/ui/ui_host.cpp b/src/ui/UiHost.cpp index 8b85ad30..069e68de 100644 --- a/src/ui/ui_host.cpp +++ b/src/ui/UiHost.cpp @@ -1,12 +1,12 @@ -#include "cru/ui/ui_host.hpp" - -#include "cru/common/logger.hpp" -#include "cru/platform/graph/painter.hpp" -#include "cru/platform/native/ui_application.hpp" -#include "cru/platform/native/window.hpp" -#include "cru/ui/render/window_render_object.hpp" -#include "cru/ui/window.hpp" -#include "routed_event_dispatch.hpp" +#include "cru/ui/UiHost.hpp" + +#include "cru/common/Logger.hpp" +#include "cru/platform/graph/Painter.hpp" +#include "cru/platform/native/UiApplication.hpp" +#include "cru/platform/native/Window.hpp" +#include "cru/ui/render/WindowRenderObject.hpp" +#include "cru/ui/Window.hpp" +#include "RoutedEventDispatch.hpp" namespace cru::ui { using platform::native::INativeWindow; diff --git a/src/ui/ui_manager.cpp b/src/ui/UiManager.cpp index 905d29ad..b8effdfd 100644 --- a/src/ui/ui_manager.cpp +++ b/src/ui/UiManager.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/ui_manager.hpp" +#include "cru/ui/UiManager.hpp" -#include "cru/platform/graph/brush.hpp" -#include "cru/platform/graph/factory.hpp" -#include "cru/platform/graph/font.hpp" -#include "cru/platform/native/ui_application.hpp" -#include "helper.hpp" +#include "cru/platform/graph/Brush.hpp" +#include "cru/platform/graph/Factory.hpp" +#include "cru/platform/graph/Font.hpp" +#include "cru/platform/native/UiApplication.hpp" +#include "Helper.hpp" namespace cru::ui { using namespace cru::platform::graph; diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 5417f4ce..cd1367fe 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/control.hpp" +#include "cru/ui/Control.hpp" -#include "cru/platform/native/cursor.hpp" -#include "cru/platform/native/ui_application.hpp" -#include "cru/ui/base.hpp" -#include "cru/ui/ui_host.hpp" -#include "routed_event_dispatch.hpp" +#include "cru/platform/native/Cursor.hpp" +#include "cru/platform/native/UiApplication.hpp" +#include "cru/ui/Base.hpp" +#include "cru/ui/UiHost.hpp" +#include "RoutedEventDispatch.hpp" #include <memory> diff --git a/src/ui/controls/flex_layout.cpp b/src/ui/controls/FlexLayout.cpp index 5412164a..25f30558 100644 --- a/src/ui/controls/flex_layout.cpp +++ b/src/ui/controls/FlexLayout.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/flex_layout.hpp" +#include "cru/ui/controls/FlexLayout.hpp" -#include "cru/ui/render/flex_layout_render_object.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.hpp" namespace cru::ui::controls { using render::FlexLayoutRenderObject; diff --git a/src/ui/controls/stack_layout.cpp b/src/ui/controls/StackLayout.cpp index 47511f33..ce500b79 100644 --- a/src/ui/controls/stack_layout.cpp +++ b/src/ui/controls/StackLayout.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/controls/stack_layout.hpp" +#include "cru/ui/controls/StackLayout.hpp" -#include "cru/ui/render/stack_layout_render_object.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" namespace cru::ui::controls { using render::StackLayoutRenderObject; diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/TextBlock.cpp index a3ec9f54..f77e279b 100644 --- a/src/ui/controls/text_block.cpp +++ b/src/ui/controls/TextBlock.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/controls/text_block.hpp" +#include "cru/ui/controls/TextBlock.hpp" -#include "cru/ui/render/canvas_render_object.hpp" -#include "cru/ui/render/stack_layout_render_object.hpp" -#include "cru/ui/render/text_render_object.hpp" -#include "cru/ui/ui_manager.hpp" -#include "text_control_service.hpp" +#include "cru/ui/render/CanvasRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/UiManager.hpp" +#include "TextControlService.hpp" namespace cru::ui::controls { using render::CanvasRenderObject; diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/TextBox.cpp index 8b7dc692..64fd4c60 100644 --- a/src/ui/controls/text_box.cpp +++ b/src/ui/controls/TextBox.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/controls/text_box.hpp" - -#include "cru/ui/render/border_render_object.hpp" -#include "cru/ui/render/canvas_render_object.hpp" -#include "cru/ui/render/stack_layout_render_object.hpp" -#include "cru/ui/render/text_render_object.hpp" -#include "cru/ui/ui_manager.hpp" -#include "text_control_service.hpp" +#include "cru/ui/controls/TextBox.hpp" + +#include "cru/ui/render/BorderRenderObject.hpp" +#include "cru/ui/render/CanvasRenderObject.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" +#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/UiManager.hpp" +#include "TextControlService.hpp" namespace cru::ui::controls { using render::BorderRenderObject; diff --git a/src/ui/controls/text_control_service.hpp b/src/ui/controls/TextControlService.hpp index 626423bf..ad0db343 100644 --- a/src/ui/controls/text_control_service.hpp +++ b/src/ui/controls/TextControlService.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../helper.hpp" -#include "cru/common/logger.hpp" -#include "cru/platform/graph/font.hpp" -#include "cru/platform/graph/painter.hpp" -#include "cru/platform/native/ui_application.hpp" -#include "cru/ui/control.hpp" -#include "cru/ui/render/canvas_render_object.hpp" -#include "cru/ui/render/text_render_object.hpp" -#include "cru/ui/ui_event.hpp" +#include "../Helper.hpp" +#include "cru/common/Logger.hpp" +#include "cru/platform/graph/Font.hpp" +#include "cru/platform/graph/Painter.hpp" +#include "cru/platform/native/UiApplication.hpp" +#include "cru/ui/Control.hpp" +#include "cru/ui/render/CanvasRenderObject.hpp" +#include "cru/ui/render/TextRenderObject.hpp" +#include "cru/ui/UiEvent.hpp" namespace cru::ui::controls { constexpr int k_default_caret_blink_duration = 500; diff --git a/src/ui/controls/button.cpp b/src/ui/controls/button.cpp index 7dd087ba..6f6af878 100644 --- a/src/ui/controls/button.cpp +++ b/src/ui/controls/button.cpp @@ -1,13 +1,13 @@ -#include "cru/ui/controls/button.hpp" +#include "cru/ui/controls/Button.hpp" #include <memory> -#include "../helper.hpp" -#include "cru/platform/graph/brush.hpp" -#include "cru/platform/native/cursor.hpp" -#include "cru/platform/native/ui_application.hpp" -#include "cru/ui/render/border_render_object.hpp" -#include "cru/ui/ui_manager.hpp" -#include "cru/ui/window.hpp" +#include "../Helper.hpp" +#include "cru/platform/graph/Brush.hpp" +#include "cru/platform/native/Cursor.hpp" +#include "cru/platform/native/UiApplication.hpp" +#include "cru/ui/render/BorderRenderObject.hpp" +#include "cru/ui/UiManager.hpp" +#include "cru/ui/Window.hpp" namespace cru::ui::controls { using cru::platform::native::SystemCursorType; diff --git a/src/ui/controls/container.cpp b/src/ui/controls/container.cpp index 84582d80..de58ee64 100644 --- a/src/ui/controls/container.cpp +++ b/src/ui/controls/container.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/controls/container.hpp" +#include "cru/ui/controls/Container.hpp" -#include "cru/platform/graph/factory.hpp" -#include "cru/ui/render/border_render_object.hpp" +#include "cru/platform/graph/Factory.hpp" +#include "cru/ui/render/BorderRenderObject.hpp" namespace cru::ui::controls { Container::Container() { diff --git a/src/ui/helper.cpp b/src/ui/helper.cpp index 4d5d8665..6f67e701 100644 --- a/src/ui/helper.cpp +++ b/src/ui/helper.cpp @@ -1,7 +1,7 @@ -#include "helper.hpp" +#include "Helper.hpp" -#include "cru/platform/graph/factory.hpp" -#include "cru/platform/native/ui_application.hpp" +#include "cru/platform/graph/Factory.hpp" +#include "cru/platform/native/UiApplication.hpp" namespace cru::ui { using cru::platform::graph::IGraphFactory; diff --git a/src/ui/helper.hpp b/src/ui/helper.hpp index 4fd14aa6..6923852f 100644 --- a/src/ui/helper.hpp +++ b/src/ui/helper.hpp @@ -1,5 +1,5 @@ #pragma once -#include "cru/ui/base.hpp" +#include "cru/ui/Base.hpp" namespace cru::platform { namespace graph { diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/BorderRenderObject.cpp index 7c96a3b6..a656cb99 100644 --- a/src/ui/render/border_render_object.cpp +++ b/src/ui/render/BorderRenderObject.cpp @@ -1,10 +1,10 @@ -#include "cru/ui/render/border_render_object.hpp" +#include "cru/ui/render/BorderRenderObject.hpp" -#include "../helper.hpp" -#include "cru/common/logger.hpp" -#include "cru/platform/graph/factory.hpp" -#include "cru/platform/graph/geometry.hpp" -#include "cru/platform/graph/util/painter.hpp" +#include "../Helper.hpp" +#include "cru/common/Logger.hpp" +#include "cru/platform/graph/Factory.hpp" +#include "cru/platform/graph/Geometry.hpp" +#include "cru/platform/graph/util/Painter.hpp" #include <algorithm> diff --git a/src/ui/render/canvas_render_object.cpp b/src/ui/render/CanvasRenderObject.cpp index 0508e276..16ac9239 100644 --- a/src/ui/render/canvas_render_object.cpp +++ b/src/ui/render/CanvasRenderObject.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/render/canvas_render_object.hpp" +#include "cru/ui/render/CanvasRenderObject.hpp" -#include "cru/ui/render/layout_utility.hpp" +#include "cru/ui/render/LayoutUtility.hpp" namespace cru::ui::render { CanvasRenderObject::CanvasRenderObject() : RenderObject(ChildMode::None) {} diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index f40a9b3e..b609fd97 100644 --- a/src/ui/render/flex_layout_render_object.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/render/flex_layout_render_object.hpp" +#include "cru/ui/render/FlexLayoutRenderObject.hpp" -#include "cru/platform/graph/util/painter.hpp" +#include "cru/platform/graph/util/Painter.hpp" #include <algorithm> #include <functional> diff --git a/src/ui/render/layout_utility.cpp b/src/ui/render/LayoutUtility.cpp index aae62d35..03252f1c 100644 --- a/src/ui/render/layout_utility.cpp +++ b/src/ui/render/LayoutUtility.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/render/layout_utility.hpp" +#include "cru/ui/render/LayoutUtility.hpp" #include <algorithm> diff --git a/src/ui/render/render_object.cpp b/src/ui/render/RenderObject.cpp index 4a1bedf3..83e306a8 100644 --- a/src/ui/render/render_object.cpp +++ b/src/ui/render/RenderObject.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/render/render_object.hpp" +#include "cru/ui/render/RenderObject.hpp" -#include "cru/common/logger.hpp" -#include "cru/ui/ui_host.hpp" +#include "cru/common/Logger.hpp" +#include "cru/ui/UiHost.hpp" #include <algorithm> diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp new file mode 100644 index 00000000..33e9e407 --- /dev/null +++ b/src/ui/render/ScrollRenderObject.cpp @@ -0,0 +1 @@ +#include "cru/ui/render/ScrollRenderObject.hpp" diff --git a/src/ui/render/stack_layout_render_object.cpp b/src/ui/render/StackLayoutRenderObject.cpp index 1cb31252..d08e136d 100644 --- a/src/ui/render/stack_layout_render_object.cpp +++ b/src/ui/render/StackLayoutRenderObject.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/render/stack_layout_render_object.hpp" +#include "cru/ui/render/StackLayoutRenderObject.hpp" #include <algorithm> diff --git a/src/ui/render/text_render_object.cpp b/src/ui/render/TextRenderObject.cpp index cd670db1..05acd086 100644 --- a/src/ui/render/text_render_object.cpp +++ b/src/ui/render/TextRenderObject.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/render/text_render_object.hpp" +#include "cru/ui/render/TextRenderObject.hpp" -#include "../helper.hpp" -#include "cru/platform/graph/factory.hpp" -#include "cru/platform/graph/text_layout.hpp" -#include "cru/platform/graph/util/painter.hpp" +#include "../Helper.hpp" +#include "cru/platform/graph/Factory.hpp" +#include "cru/platform/graph/TextLayout.hpp" +#include "cru/platform/graph/util/Painter.hpp" #include <algorithm> diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/WindowRenderObject.cpp index abed6fa4..cd1f806f 100644 --- a/src/ui/render/window_render_object.cpp +++ b/src/ui/render/WindowRenderObject.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/render/window_render_object.hpp" +#include "cru/ui/render/WindowRenderObject.hpp" -#include "../helper.hpp" -#include "cru/platform/graph/util/painter.hpp" -#include "cru/ui/ui_host.hpp" +#include "../Helper.hpp" +#include "cru/platform/graph/util/Painter.hpp" +#include "cru/ui/UiHost.hpp" namespace cru::ui::render { WindowRenderObject::WindowRenderObject(UiHost* host) { diff --git a/src/ui/render/scroll_render_object.cpp b/src/ui/render/scroll_render_object.cpp deleted file mode 100644 index f77ee636..00000000 --- a/src/ui/render/scroll_render_object.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "cru/ui/render/scroll_render_object.hpp" diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 7c0683af..de7044dd 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -1,7 +1,7 @@ -#include "cru/ui/window.hpp" +#include "cru/ui/Window.hpp" -#include "cru/ui/render/window_render_object.hpp" -#include "cru/ui/ui_host.hpp" +#include "cru/ui/render/WindowRenderObject.hpp" +#include "cru/ui/UiHost.hpp" namespace cru::ui { Window* Window::CreateOverlapped() { |