Merge pull request #82423 from bruvzg/mac_ex_fs

[macOS] Check all exclusive fullscreen windows before setting presentation mode.
godotengine · Oct 3, 2023 · be6a09b · be6a09b
2 parents 30bc077 + b7b5fbe
commit be6a09b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h
@@ -245,6 +245,7 @@ class DisplayServerMacOS : public DisplayServer {
 	WindowID _get_focused_window_or_popup() const;
 	void mouse_enter_window(WindowID p_window);
 	void mouse_exit_window(WindowID p_window);
+	void update_presentation_mode();
 
 	void window_destroy(WindowID p_window);
 	void window_resize(WindowID p_window, int p_width, int p_height);

diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
@@ -749,6 +749,7 @@
 	}
 #endif
 	windows.erase(p_window);
+	update_presentation_mode();
 }
 
 void DisplayServerMacOS::window_resize(WindowID p_window, int p_width, int p_height) {
@@ -2917,6 +2918,15 @@
 	return wd.max_size;
 }
 
+void DisplayServerMacOS::update_presentation_mode() {
+	for (const KeyValue<WindowID, WindowData> &wd : windows) {
+		if (wd.value.fullscreen && wd.value.exclusive_fullscreen) {
+			return;
+		}
+	}
+	[NSApp setPresentationOptions:NSApplicationPresentationDefault];
+}
+
 void DisplayServerMacOS::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
@@ -3027,7 +3037,7 @@
 			[wd.window_object toggleFullScreen:nil];
 
 			if (old_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
-				[NSApp setPresentationOptions:NSApplicationPresentationDefault];
+				update_presentation_mode();
 			}
 
 			wd.fullscreen = false;

diff --git a/platform/macos/godot_window_delegate.mm b/platform/macos/godot_window_delegate.mm
@@ -157,7 +157,7 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification {
 
 	DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
 	if (wd.exclusive_fullscreen) {
-		[NSApp setPresentationOptions:NSApplicationPresentationDefault];
+		ds->update_presentation_mode();
 	}
 
 	wd.fullscreen = false;