Преглед изворни кода

Merge pull request #76868 from chfoo/issue-72728

Ensure WindowData minimized/maximized are mutually exclusive
Rémi Verschelde пре 2 година
родитељ
комит
e56427b4f5
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      platform/linuxbsd/x11/display_server_x11.cpp

+ 2 - 2
platform/linuxbsd/x11/display_server_x11.cpp

@@ -3497,8 +3497,8 @@ void DisplayServerX11::_window_changed(XEvent *event) {
 
 
 	// Query display server about a possible new window state.
 	// Query display server about a possible new window state.
 	wd.fullscreen = _window_fullscreen_check(window_id);
 	wd.fullscreen = _window_fullscreen_check(window_id);
-	wd.minimized = _window_minimize_check(window_id);
-	wd.maximized = _window_maximize_check(window_id, "_NET_WM_STATE");
+	wd.maximized = _window_maximize_check(window_id, "_NET_WM_STATE") && !wd.fullscreen;
+	wd.minimized = _window_minimize_check(window_id) && !wd.fullscreen && !wd.maximized;
 
 
 	// Readjusting the window position if the window is being reparented by the window manager for decoration
 	// Readjusting the window position if the window is being reparented by the window manager for decoration
 	Window root, parent, *children;
 	Window root, parent, *children;