summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2024-06-28 12:37:52 +0200
committerGitHub <noreply@github.com>2024-06-28 12:37:52 +0200
commitac9181c666fc9a28e56c6fbf37d665687c1d722a (patch)
tree531376ec32accefa441cd875632acc37b12ce71e
parent90bd2c2d0d4fdeeb8dd2b1cd4f84b3c5dc061951 (diff)
parent1289298b5e262419d19eba2b4f6e591de11369fa (diff)
downloadredot-engine-ac9181c666fc9a28e56c6fbf37d665687c1d722a.tar.gz
Merge pull request #93682 from dsnopek/fix-text-editor-find-in-files-focus-bug
Fix text editor stealing focus from "Find in Files" dialog on X11
-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 a605e664ce..ea84130828 100644
--- a/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -3040,7 +3040,7 @@ void DisplayServerX11::window_set_ime_active(const bool p_active, WindowID p_win
XWindowAttributes xwa;
XSync(x11_display, False);
XGetWindowAttributes(x11_display, wd.x11_xim_window, &xwa);
- if (xwa.map_state == IsViewable && _window_focus_check()) {
+ if (xwa.map_state == IsViewable) {
_set_input_focus(wd.x11_xim_window, RevertToParent);
}
XSetICFocus(wd.xic);