From 6aa2201797a9ed64ce0178215ae941d0c5f09579 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 30 Oct 2020 00:07:57 +0800 Subject: ... --- include/cru/platform/gui/Cursor.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 include/cru/platform/gui/Cursor.hpp (limited to 'include/cru/platform/gui/Cursor.hpp') diff --git a/include/cru/platform/gui/Cursor.hpp b/include/cru/platform/gui/Cursor.hpp new file mode 100644 index 00000000..3f1679e4 --- /dev/null +++ b/include/cru/platform/gui/Cursor.hpp @@ -0,0 +1,14 @@ +#pragma once +#include "Base.hpp" + +#include + +namespace cru::platform::gui { +struct ICursor : virtual INativeResource {}; + +struct ICursorManager : virtual INativeResource { + virtual std::shared_ptr GetSystemCursor(SystemCursorType type) = 0; + + // TODO: Add method to create cursor. +}; +} // namespace cru::platform::gui -- cgit v1.2.3 From 141fbebbe604eac53d12e7de11f999044e286cb6 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 10 Nov 2020 14:42:36 +0800 Subject: ... --- include/cru/platform/gui/Base.hpp | 5 ----- include/cru/platform/gui/Cursor.hpp | 2 ++ include/cru/win/gui/Cursor.hpp | 1 + src/ui/controls/TextControlService.hpp | 5 +++++ src/win/gui/Cursor.cpp | 5 ++++- 5 files changed, 12 insertions(+), 6 deletions(-) (limited to 'include/cru/platform/gui/Cursor.hpp') diff --git a/include/cru/platform/gui/Base.hpp b/include/cru/platform/gui/Base.hpp index fb196f02..7a9d1889 100644 --- a/include/cru/platform/gui/Base.hpp +++ b/include/cru/platform/gui/Base.hpp @@ -25,11 +25,6 @@ constexpr MouseButton middle{0b10}; constexpr MouseButton right{0b100}; } // namespace mouse_buttons -enum class SystemCursorType { - Arrow, - Hand, -}; - struct NativeMouseButtonEventArgs { MouseButton button; Point point; diff --git a/include/cru/platform/gui/Cursor.hpp b/include/cru/platform/gui/Cursor.hpp index 3f1679e4..316496a0 100644 --- a/include/cru/platform/gui/Cursor.hpp +++ b/include/cru/platform/gui/Cursor.hpp @@ -4,6 +4,8 @@ #include namespace cru::platform::gui { +enum class SystemCursorType { Arrow, Hand, IBeam }; + struct ICursor : virtual INativeResource {}; struct ICursorManager : virtual INativeResource { diff --git a/include/cru/win/gui/Cursor.hpp b/include/cru/win/gui/Cursor.hpp index cd13ded7..e7c76879 100644 --- a/include/cru/win/gui/Cursor.hpp +++ b/include/cru/win/gui/Cursor.hpp @@ -45,5 +45,6 @@ class WinCursorManager : public WinNativeResource, private: std::shared_ptr sys_arrow_; std::shared_ptr sys_hand_; + std::shared_ptr sys_ibeam_; }; } // namespace cru::platform::gui::win diff --git a/src/ui/controls/TextControlService.hpp b/src/ui/controls/TextControlService.hpp index 8ad95dec..92a66f5e 100644 --- a/src/ui/controls/TextControlService.hpp +++ b/src/ui/controls/TextControlService.hpp @@ -4,6 +4,7 @@ #include "cru/common/StringUtil.hpp" #include "cru/platform/graphics/Font.hpp" #include "cru/platform/graphics/Painter.hpp" +#include "cru/platform/gui/Cursor.hpp" #include "cru/platform/gui/InputMethod.hpp" #include "cru/platform/gui/UiApplication.hpp" #include "cru/platform/gui/Window.hpp" @@ -50,10 +51,14 @@ class TextControlService : public Object { if (this->caret_visible_) { this->SetupCaret(); } + this->control_->SetCursor( + GetUiApplication()->GetCursorManager()->GetSystemCursor( + platform::gui::SystemCursorType::IBeam)); } else { this->AbortSelection(); this->TearDownHandlers(); this->TearDownCaret(); + this->control_->SetCursor(nullptr); } } diff --git a/src/win/gui/Cursor.cpp b/src/win/gui/Cursor.cpp index 5f3086fa..80e8a749 100644 --- a/src/win/gui/Cursor.cpp +++ b/src/win/gui/Cursor.cpp @@ -35,7 +35,8 @@ WinCursor* LoadWinCursor(const wchar_t* name) { WinCursorManager::WinCursorManager() : sys_arrow_(LoadWinCursor(IDC_ARROW)), - sys_hand_(LoadWinCursor(IDC_HAND)) {} + sys_hand_(LoadWinCursor(IDC_HAND)), + sys_ibeam_(LoadWinCursor(IDC_IBEAM)) {} std::shared_ptr WinCursorManager::GetSystemWinCursor( SystemCursorType type) { @@ -44,6 +45,8 @@ std::shared_ptr WinCursorManager::GetSystemWinCursor( return sys_arrow_; case SystemCursorType::Hand: return sys_hand_; + case SystemCursorType::IBeam: + return sys_ibeam_; default: throw std::runtime_error("Unknown system cursor value."); } -- cgit v1.2.3