encounter/aurora
0
0
Fork 0
mirror of https://github.com/encounter/aurora.git synced 2026-07-09 18:19:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Patch RmlUi to fix IME keyboard state

Browse Source
This commit is contained in:
Luke Street
2026-06-16 14:20:59 -06:00
parent 9ba857096c
commit 22351fb0b7
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/patches/apply-rmlui-keyboard-showed-state.cmake
+77
View File
@@ -0,0 +1,77 @@
if (NOT DEFINED RMLUI_SOURCE_DIR)
message(FATAL_ERROR "RMLUI_SOURCE_DIR is required")
endif ()
set(_rmlui_widget "${RMLUI_SOURCE_DIR}/Source/Core/Elements/WidgetTextInput.cpp")
file(READ "${_rmlui_widget}" _contents)
string(FIND "${_contents}" "keyboard_showed = active;" _already_patched)
if (_already_patched GREATER_EQUAL 0)
message(STATUS "RmlUi keyboard state patch already applied")
return()
endif ()
string(FIND "${_contents}" "keyboard_showed = true;" _older_state_tracking)
if (_older_state_tracking GREATER_EQUAL 0)
message(STATUS "RmlUi already tracks keyboard state")
return()
endif ()
set(_old_block [=[
void WidgetTextInput::SetKeyboardActive(bool active)
{
if (!keyboard_showed && !active)
return;
SystemInterface* system = GetSystemInterface();
if (!system)
return;
if (active)
{
// Activate the keyboard and submit the cursor position and line height to enable clients to adjust the input method editor (IME).
const Vector2f element_offset = parent->GetAbsoluteOffset() - Vector2f{parent->GetScrollLeft(), parent->GetScrollTop()};
const Vector2f absolute_cursor_position = element_offset + cursor_position;
system->ActivateKeyboard(absolute_cursor_position, cursor_size.y);
}
else
{
system->DeactivateKeyboard();
}
}
]=])
set(_new_block [=[
void WidgetTextInput::SetKeyboardActive(bool active)
{
if (!keyboard_showed && !active)
return;
SystemInterface* system = GetSystemInterface();
if (!system)
return;
if (active)
{
// Activate the keyboard and submit the cursor position and line height to enable clients to adjust the input method editor (IME).
const Vector2f element_offset = parent->GetAbsoluteOffset() - Vector2f{parent->GetScrollLeft(), parent->GetScrollTop()};
const Vector2f absolute_cursor_position = element_offset + cursor_position;
system->ActivateKeyboard(absolute_cursor_position, cursor_size.y);
}
else
{
system->DeactivateKeyboard();
}
keyboard_showed = active;
}
]=])
string(FIND "${_contents}" "${_old_block}" _old_pos)
if (_old_pos LESS 0)
message(FATAL_ERROR "Failed to apply RmlUi keyboard state patch")
endif ()
string(REPLACE "${_old_block}" "${_new_block}" _contents "${_contents}")
file(WRITE "${_rmlui_widget}" "${_contents}")
message(STATUS "Applied RmlUi keyboard state patch")
extern/CMakeLists.txt
Vendored
+3
View File
@@ -289,6 +289,9 @@ if (AURORA_ENABLE_GX)
URL https://github.com/mikke89/RmlUi/archive/f9b8c9e2935d5df2c7dff2c190d3968e99b0c3dc.tar.gz
URL_HASH SHA256=42b830abc2509a8c07cf02ba3313505de3a4642725654f489402022d8fefdd79
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
PATCH_COMMAND ${CMAKE_COMMAND}
-DRMLUI_SOURCE_DIR=<SOURCE_DIR>
-P "${CMAKE_CURRENT_LIST_DIR}/../cmake/patches/apply-rmlui-keyboard-showed-state.cmake"
EXCLUDE_FROM_ALL
)
FetchContent_MakeAvailable(rmlui)