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

OS_X11::set_window_maximized gives up after 0.5s 

Spinning forever is clearly worse, especially since this happens on at
least FVWM even though the window actually is maximized.
This commit is contained in:
Carl Drougge 2019-08-10 21:09:21 +02:00
parent 3418f76a9e
commit deb73001ab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/x11/os_x11.cpp
View File

@ -1518,9 +1518,12 @@ void OS_X11::set_window_maximized(bool p_enabled) {
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
if (is_window_maximize_allowed()) {
while (p_enabled && !is_window_maximized()) {
if (p_enabled && is_window_maximize_allowed()) {
// Wait for effective resizing (so the GLX context is too).
// Give up after 0.5s, it's not going to happen on this WM.
// https://github.com/godotengine/godot/issues/19978
for (int attempt = 0; !is_window_maximized() && attempt < 50; attempt++) {
usleep(10000);
}
}