aboutsummaryrefslogtreecommitdiff
path: root/src/ui/controls
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-05-24 01:40:02 +0800
committercrupest <crupest@outlook.com>2020-05-24 01:40:02 +0800
commitd86a71f79afe0e4dac768f61d6bff690567aca5b (patch)
tree4957e9a64c77680deb07201fbd879bf036616dae /src/ui/controls
parentf3a8fd608a9776ef0a5f547da918a32cf6074060 (diff)
downloadcru-d86a71f79afe0e4dac768f61d6bff690567aca5b.tar.gz
cru-d86a71f79afe0e4dac768f61d6bff690567aca5b.tar.bz2
cru-d86a71f79afe0e4dac768f61d6bff690567aca5b.zip
...
Diffstat (limited to 'src/ui/controls')
-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.cpp16
-rw-r--r--src/ui/controls/container.cpp6
7 files changed, 38 insertions, 38 deletions
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() {