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

Merge pull request #90131 from rodrigodias4/fix86495 

Fix macOS menu bar & dock stop appearing after closing sub-window
This commit is contained in:
Rémi Verschelde 2024-04-04 14:37:24 +02:00
parent ffa650f1d8 a4f2e5210f
commit 61b56f6019
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/macos/display_server_macos.mm
View File

@ -2084,12 +2084,21 @@ Size2i DisplayServerMacOS::window_get_max_size(WindowID p_window) const {
}
void DisplayServerMacOS::update_presentation_mode() {
bool has_fs_windows = false;
for (const KeyValue<WindowID, WindowData> &wd : windows) {
if (wd.value.fullscreen && wd.value.exclusive_fullscreen) {
return;
if (wd.value.fullscreen) {
if (wd.value.exclusive_fullscreen) {
return;
} else {
has_fs_windows = true;
}
}
}
[NSApp setPresentationOptions:NSApplicationPresentationDefault];
if (has_fs_windows) {
[NSApp setPresentationOptions:NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock | NSApplicationPresentationFullScreen];
} else {
[NSApp setPresentationOptions:NSApplicationPresentationDefault];
}
}
void DisplayServerMacOS::window_set_min_size(const Size2i p_size, WindowID p_window) {