summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-26 09:53:05 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-26 09:53:05 +0100
commitcc7aa72f01fdea5f93b0a618fcd12db55617beb0 (patch)
treee9262b47df187533ddd1a4e7ad06102f35f8aa3f /platform
parent886c0dbef9eb7b6fed56cba3abe2a93b4f2753e6 (diff)
parent912c937921f9d3272d9a0889ac18d22ae16bb186 (diff)
Merge pull request #72101 from bruvzg/x11_ime_unfocus
[X11] Fix IME focus return.
Diffstat (limited to 'platform')
-rw-r--r--platform/linuxbsd/x11/display_server_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp
index e4553905cd..428cf3a145 100644
--- a/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -1610,7 +1610,7 @@ void DisplayServerX11::window_set_transient(WindowID p_window, WindowID p_parent
// a subwindow and its parent are both destroyed.
if (!wd_window.no_focus && !wd_window.is_popup && wd_window.focused) {
if ((xwa.map_state == IsViewable) && !wd_parent.no_focus && !wd_window.is_popup) {
- XSetInputFocus(x11_display, wd_parent.x11_window, RevertToPointerRoot, CurrentTime);
+ XSetInputFocus(x11_display, wd_parent.x11_window, RevertToParent, CurrentTime);
}
}
} else {