aboutsummaryrefslogtreecommitdiff
path: root/src/platform/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/platform/gui')
-rw-r--r--src/platform/gui/osx/Window.mm19
-rw-r--r--src/platform/gui/win/Clipboard.cpp4
-rw-r--r--src/platform/gui/win/InputMethod.cpp26
-rw-r--r--src/platform/gui/win/Window.cpp4
4 files changed, 26 insertions, 27 deletions
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index 167adfc5..2d30724f 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -3,9 +3,9 @@
#include "CursorPrivate.h"
#include "InputMethodPrivate.h"
-#include "cru/base/platform/osx/Base.h"
#include "cru/base/Range.h"
#include "cru/base/log/Logger.h"
+#include "cru/base/platform/osx/Base.h"
#include "cru/platform/graphics/NullPainter.h"
#include "cru/platform/graphics/quartz/Painter.h"
#include "cru/platform/gui/Input.h"
@@ -384,9 +384,15 @@ IEvent<MouseEnterLeaveType>* OsxWindow::MouseEnterLeaveEvent() {
return &p_->mouse_enter_leave_event_;
}
IEvent<const Point&>* OsxWindow::MouseMoveEvent() { return &p_->mouse_move_event_; }
-IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseDownEvent() { return &p_->mouse_down_event_; }
-IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseUpEvent() { return &p_->mouse_up_event_; }
-IEvent<const NativeMouseWheelEventArgs&>* OsxWindow::MouseWheelEvent() { return &p_->mouse_wheel_event_; }
+IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseDownEvent() {
+ return &p_->mouse_down_event_;
+}
+IEvent<const NativeMouseButtonEventArgs&>* OsxWindow::MouseUpEvent() {
+ return &p_->mouse_up_event_;
+}
+IEvent<const NativeMouseWheelEventArgs&>* OsxWindow::MouseWheelEvent() {
+ return &p_->mouse_wheel_event_;
+}
IEvent<const NativeKeyEventArgs&>* OsxWindow::KeyDownEvent() { return &p_->key_down_event_; }
IEvent<const NativeKeyEventArgs&>* OsxWindow::KeyUpEvent() { return &p_->key_up_event_; }
@@ -685,10 +691,9 @@ const std::unordered_set<KeyCode> input_context_handle_codes_when_has_text{
cru::platform::gui::CompositionText composition_text;
composition_text.text = FromCFStringRef((CFStringRef)[_input_context_text string]);
composition_text.selection.position =
- cru::string::Utf8IndexCodePointToCodeUnit(ss.data(), ss.size(), selectedRange.location);
+ cru::string::Utf8IndexCodePointToCodeUnit(ss, selectedRange.location);
composition_text.selection.count =
- cru::string::Utf8IndexCodePointToCodeUnit(ss.data(), ss.size(),
- selectedRange.location + selectedRange.length) -
+ cru::string::Utf8IndexCodePointToCodeUnit(ss, selectedRange.location + selectedRange.length) -
composition_text.selection.position;
_input_context_p->SetCompositionText(composition_text);
_input_context_p->RaiseCompositionEvent();
diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp
index 7062f160..2a41a1eb 100644
--- a/src/platform/gui/win/Clipboard.cpp
+++ b/src/platform/gui/win/Clipboard.cpp
@@ -39,11 +39,11 @@ std::string WinClipboard::GetText() {
::GlobalUnlock(handle);
::CloseClipboard();
- return string::ToUtf8(result);
+ return string::ToUtf8String(result);
}
void WinClipboard::SetText(std::string utf8_text) {
- auto text = string::ToUtf16(utf8_text);
+ auto text = string::ToUtf16WString(utf8_text);
if (!::OpenClipboard(nullptr)) {
CRU_LOG_TAG_WARN("Failed to open clipboard.");
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index c5aca657..812670e1 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -123,7 +123,7 @@ CompositionText GetCompositionInfo(HIMC imm_context) {
// convert them into underlines and selection range respectively.
auto utf16_text = GetString(imm_context);
- auto text = string::ToUtf8(utf16_text);
+ auto text = string::ToUtf8String(utf16_text);
int length = static_cast<int>(utf16_text.length());
// Find out the range selected by the user.
@@ -134,23 +134,15 @@ CompositionText GetCompositionInfo(HIMC imm_context) {
auto clauses = GetCompositionClauses(imm_context, target_start, target_end);
for (auto& clause : clauses) {
clause.start = string::Utf8IndexCodePointToCodeUnit(
- text.data(), text.size(),
- string::Utf16IndexCodeUnitToCodePoint(
- reinterpret_cast<const char16_t*>(utf16_text.data()),
- utf16_text.size(), clause.start));
+ text, string::Utf16IndexCodeUnitToCodePoint(utf16_text, clause.start));
clause.end = string::Utf8IndexCodePointToCodeUnit(
- text.data(), text.size(),
- string::Utf16IndexCodeUnitToCodePoint(
- reinterpret_cast<const char16_t*>(utf16_text.data()),
- utf16_text.size(), clause.end));
+ text, string::Utf16IndexCodeUnitToCodePoint(utf16_text, clause.end));
}
int cursor = string::Utf8IndexCodePointToCodeUnit(
- text.data(), text.size(),
- string::Utf16IndexCodeUnitToCodePoint(
- reinterpret_cast<const char16_t*>(utf16_text.data()),
- utf16_text.size(),
- ::ImmGetCompositionString(imm_context, GCS_CURSORPOS, NULL, 0)));
+ text, string::Utf16IndexCodeUnitToCodePoint(
+ utf16_text, ::ImmGetCompositionString(imm_context,
+ GCS_CURSORPOS, NULL, 0)));
return CompositionText{std::move(text), std::move(clauses),
TextRange{cursor}};
@@ -229,7 +221,9 @@ IEvent<std::nullptr_t>* WinInputMethodContext::CompositionEvent() {
return &composition_event_;
}
-IEvent<const std::string&>* WinInputMethodContext::TextEvent() { return &text_event_; }
+IEvent<const std::string&>* WinInputMethodContext::TextEvent() {
+ return &text_event_;
+}
void WinInputMethodContext::OnWindowNativeMessage(
WindowNativeMessageEventArgs& args) {
@@ -286,7 +280,7 @@ void WinInputMethodContext::OnWindowNativeMessage(
std::string WinInputMethodContext::GetResultString() {
auto himc = GetHIMC();
auto result = win::GetResultString(himc.Get());
- return string::ToUtf8(result);
+ return string::ToUtf8String(result);
}
AutoHIMC WinInputMethodContext::GetHIMC() {
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index e24bb08e..02357336 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -96,7 +96,7 @@ void WinNativeWindow::SetTitle(std::string title) {
title_ = title;
if (hwnd_) {
- auto utf16_text = string::ToUtf16(title);
+ auto utf16_text = string::ToUtf16WString(title);
::SetWindowTextW(hwnd_, utf16_text.c_str());
}
}
@@ -498,7 +498,7 @@ void WinNativeWindow::RecreateWindow() {
SetCursor(application_->GetCursorManager()->GetSystemCursor(
cru::platform::gui::SystemCursorType::Arrow));
- auto utf16_title = string::ToUtf16(title_);
+ auto utf16_title = string::ToUtf16WString(title_);
::SetWindowTextW(hwnd_, utf16_title.c_str());
window_render_target_ =
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-21 18:25:17 +0000