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

Merge pull request #82423 from bruvzg/mac_ex_fs

Browse Source 
[macOS] Check all exclusive fullscreen windows before setting presentation mode.
This commit is contained in:
Rémi Verschelde 2023-10-03 17:23:18 +02:00
commit be6a09b6ec
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/macos/display_server_macos.h
View File

@ -245,6 +245,7 @@ public:
WindowID _get_focused_window_or_popup() const; WindowID _get_focused_window_or_popup() const;
void mouse_enter_window(WindowID p_window); void mouse_enter_window(WindowID p_window);
void mouse_exit_window(WindowID p_window); void mouse_exit_window(WindowID p_window);
void update_presentation_mode();
void window_destroy(WindowID p_window); void window_destroy(WindowID p_window);
void window_resize(WindowID p_window, int p_width, int p_height); void window_resize(WindowID p_window, int p_width, int p_height);

12
platform/macos/display_server_macos.mm
View File

@ -749,6 +749,7 @@ void DisplayServerMacOS::window_destroy(WindowID p_window) {
} }
#endif #endif
windows.erase(p_window); windows.erase(p_window);
update_presentation_mode();
} }
void DisplayServerMacOS::window_resize(WindowID p_window, int p_width, int p_height) { void DisplayServerMacOS::window_resize(WindowID p_window, int p_width, int p_height) {
@ -2917,6 +2918,15 @@ Size2i DisplayServerMacOS::window_get_max_size(WindowID p_window) const {
return wd.max_size; 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) { void DisplayServerMacOS::window_set_min_size(const Size2i p_size, WindowID p_window) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
@ -3027,7 +3037,7 @@ void DisplayServerMacOS::window_set_mode(WindowMode p_mode, WindowID p_window) {
[wd.window_object toggleFullScreen:nil]; [wd.window_object toggleFullScreen:nil];
if (old_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) { if (old_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
[NSApp setPresentationOptions:NSApplicationPresentationDefault]; update_presentation_mode();
} }
wd.fullscreen = false; wd.fullscreen = false;

2
platform/macos/godot_window_delegate.mm
View File

@ -157,7 +157,7 @@
DisplayServerMacOS::WindowData &wd = ds->get_window(window_id); DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
if (wd.exclusive_fullscreen) { if (wd.exclusive_fullscreen) {
[NSApp setPresentationOptions:NSApplicationPresentationDefault]; ds->update_presentation_mode();
} }
wd.fullscreen = false; wd.fullscreen = false;