seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #103059 from bruvzg/ime_update

Browse Source 
[IME] Do not redraw and move caret on IME update w/o text/position changes.
This commit is contained in:
Thaddeus Crews
2025-02-20 07:47:54 -06:00
committed by GitHub
parent 70eb62faf2 84a2e3fdb0
commit 45875c2a6c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/gui/line_edit.cpp
View File

@ -1377,8 +1377,14 @@ void LineEdit::_notification(int p_what) {
case MainLoop::NOTIFICATION_OS_IME_UPDATE: {
if (editing) {
ime_text = DisplayServer::get_singleton()->ime_get_text();
ime_selection = DisplayServer::get_singleton()->ime_get_selection();
const String &new_ime_text = DisplayServer::get_singleton()->ime_get_text();
const Vector2i &new_ime_selection = DisplayServer::get_singleton()->ime_get_selection();
if (ime_text == new_ime_text && ime_selection == new_ime_selection) {
break;
}
ime_text = new_ime_text;
ime_selection = new_ime_selection;
if (!ime_text.is_empty()) {
selection_delete();

10
scene/gui/text_edit.cpp
View File

@ -1633,9 +1633,15 @@ void TextEdit::_notification(int p_what) {
case MainLoop::NOTIFICATION_OS_IME_UPDATE: {
if (has_focus()) {
const String &new_ime_text = DisplayServer::get_singleton()->ime_get_text();
const Vector2i &new_ime_selection = DisplayServer::get_singleton()->ime_get_selection();
if (ime_text == new_ime_text && ime_selection == new_ime_selection) {
break;
}
bool had_ime_text = has_ime_text();
ime_text = DisplayServer::get_singleton()->ime_get_text();
ime_selection = DisplayServer::get_singleton()->ime_get_selection();
ime_text = new_ime_text;
ime_selection = new_ime_selection;
if (!had_ime_text && has_ime_text()) {
_cancel_drag_and_drop_text();