From fdde7713a87aa84f0516b73a6b4820054b510227 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Wed, 6 Nov 2024 09:47:08 +0200
Subject: [PATCH] Fix IME deactivation events not send on focus loss. Do not
 unset AltGr modifiers in non-IME input.

---
 platform/windows/display_server_windows.cpp | 4 ++--
 scene/gui/line_edit.cpp                     | 2 ++
 scene/gui/text_edit.cpp                     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index a06395ae3a6..a6eab1bd296 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -5438,7 +5438,7 @@ void DisplayServerWindows::_process_key_events() {
 					k->set_physical_keycode(physical_keycode);
 					k->set_key_label(key_label);
 					k->set_unicode(fix_unicode(unicode));
-					if (k->get_unicode() && ke.altgr) {
+					if (k->get_unicode() && ke.altgr && windows[ke.window_id].ime_active) {
 						k->set_alt_pressed(false);
 						k->set_ctrl_pressed(false);
 					}
@@ -5514,7 +5514,7 @@ void DisplayServerWindows::_process_key_events() {
 					}
 					k->set_unicode(fix_unicode(unicode));
 				}
-				if (k->get_unicode() && ke.altgr) {
+				if (k->get_unicode() && ke.altgr && windows[ke.window_id].ime_active) {
 					k->set_alt_pressed(false);
 					k->set_ctrl_pressed(false);
 				}
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 99678051346..3f979f7c20a 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -128,6 +128,7 @@ bool LineEdit::has_ime_text() const {
 
 void LineEdit::cancel_ime() {
 	if (!has_ime_text()) {
+		_close_ime_window();
 		return;
 	}
 	ime_text = String();
@@ -140,6 +141,7 @@ void LineEdit::cancel_ime() {
 
 void LineEdit::apply_ime() {
 	if (!has_ime_text()) {
+		_close_ime_window();
 		return;
 	}
 
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 7a2570f400e..b1918ff23fc 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3169,6 +3169,7 @@ bool TextEdit::has_ime_text() const {
 
 void TextEdit::cancel_ime() {
 	if (!has_ime_text()) {
+		_close_ime_window();
 		return;
 	}
 	ime_text = String();
@@ -3181,6 +3182,7 @@ void TextEdit::cancel_ime() {
 
 void TextEdit::apply_ime() {
 	if (!has_ime_text()) {
+		_close_ime_window();
 		return;
 	}