diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-04 14:37:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-04 14:37:24 +0200 |
| commit | 61b56f60199033083e74ccdacde240dd6bb8d23a (patch) | |
| tree | 36fc03433e8cc4fe2e7a9f38ece4093f25b8d7c1 /platform | |
| parent | ffa650f1d87e9718f8cd1c61818b23a549a329e6 (diff) | |
| parent | a4f2e5210f80c3b2badfadcd7fe9004a26dbb221 (diff) | |
| download | redot-engine-61b56f60199033083e74ccdacde240dd6bb8d23a.tar.gz | |
Merge pull request #90131 from rodrigodias4/fix86495
Fix macOS menu bar & dock stop appearing after closing sub-window
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/macos/display_server_macos.mm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 9d6531a2b5..b7a9fb1bbd 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -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) { |