ソースを参照

Merge pull request #43631 from RandomShaper/fix_no_window_3.2

Ignore query to maximize/minimize window on Windows and X11
Rémi Verschelde 4 年 前
コミット
545931545c
2 ファイル変更14 行追加0 行削除
  1. 8 0
      platform/windows/os_windows.cpp
  2. 6 0
      platform/x11/os_x11.cpp

+ 8 - 0
platform/windows/os_windows.cpp

@@ -2269,6 +2269,10 @@ bool OS_Windows::is_window_resizable() const {
 }
 void OS_Windows::set_window_minimized(bool p_enabled) {
 
+	if (is_no_window_mode_enabled()) {
+		return;
+	}
+
 	if (p_enabled) {
 		maximized = false;
 		minimized = true;
@@ -2285,6 +2289,10 @@ bool OS_Windows::is_window_minimized() const {
 }
 void OS_Windows::set_window_maximized(bool p_enabled) {
 
+	if (is_no_window_mode_enabled()) {
+		return;
+	}
+
 	if (p_enabled) {
 		maximized = true;
 		minimized = false;

+ 6 - 0
platform/x11/os_x11.cpp

@@ -1518,6 +1518,9 @@ bool OS_X11::is_window_resizable() const {
 }
 
 void OS_X11::set_window_minimized(bool p_enabled) {
+	if (is_no_window_mode_enabled()) {
+		return;
+	}
 	// Using ICCCM -- Inter-Client Communication Conventions Manual
 	XEvent xev;
 	Atom wm_change = XInternAtom(x11_display, "WM_CHANGE_STATE", False);
@@ -1581,6 +1584,9 @@ bool OS_X11::is_window_minimized() const {
 }
 
 void OS_X11::set_window_maximized(bool p_enabled) {
+	if (is_no_window_mode_enabled()) {
+		return;
+	}
 	if (is_window_maximized() == p_enabled)
 		return;