godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Fix X11 menu window bug.

Browse Source 
Fixes an issue where XSetInputFocus fails due to the window not
being viewable.

Fixes #62635
Fixes #60690
This commit is contained in:
MatthewZelriche
2022-08-26 14:13:58 -06:00
parent 390333e822
commit 93af2993f0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/linuxbsd/display_server_x11.cpp
View File

@@ -1522,11 +1522,15 @@ void DisplayServerX11::window_set_transient(WindowID p_window, WindowID p_parent
XSetTransientForHint(x11_display, wd_window.x11_window, None); XSetTransientForHint(x11_display, wd_window.x11_window, None);
XWindowAttributes xwa;
XSync(x11_display, False);
XGetWindowAttributes(x11_display, wd_parent.x11_window, &xwa);
// Set focus to parent sub window to avoid losing all focus when closing a nested sub-menu. // Set focus to parent sub window to avoid losing all focus when closing a nested sub-menu.
// RevertToPointerRoot is used to make sure we don't lose all focus in case // RevertToPointerRoot is used to make sure we don't lose all focus in case
// a subwindow and its parent are both destroyed. // a subwindow and its parent are both destroyed.
if (!wd_window.no_focus && !wd_window.is_popup && wd_window.focused) { if (!wd_window.no_focus && !wd_window.is_popup && wd_window.focused) {
if (!wd_parent.no_focus && !wd_window.is_popup) { 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, RevertToPointerRoot, CurrentTime);
} }
} }
@@ -3646,10 +3650,14 @@ void DisplayServerX11::process_events() {
const WindowData &wd = windows[window_id]; const WindowData &wd = windows[window_id];
XWindowAttributes xwa;
XSync(x11_display, False);
XGetWindowAttributes(x11_display, wd.x11_window, &xwa);
// Set focus when menu window is started. // Set focus when menu window is started.
// RevertToPointerRoot is used to make sure we don't lose all focus in case // RevertToPointerRoot is used to make sure we don't lose all focus in case
// a subwindow and its parent are both destroyed. // a subwindow and its parent are both destroyed.
if (!wd.no_focus && !wd.is_popup) { if ((xwa.map_state == IsViewable) && !wd.no_focus && !wd.is_popup) {
XSetInputFocus(x11_display, wd.x11_window, RevertToPointerRoot, CurrentTime); XSetInputFocus(x11_display, wd.x11_window, RevertToPointerRoot, CurrentTime);
} }
} break; } break;