diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-28 13:22:28 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-28 13:22:28 +0100 |
| commit | 18e4158302ff9b472ad521c81c1549b3ded22d28 (patch) | |
| tree | c78bf6ae9d041ec5020d889c584969ba6a7f4f55 /platform/macos/display_server_macos.mm | |
| parent | 7b18bf7bbd82a58980aae46a33c1238f25dad708 (diff) | |
| parent | aaf4d7dfe1bce9fb5ff90f51e116094164990ca5 (diff) | |
Merge pull request #69296 from bruvzg/macos_fix_fs_subwindows
[macOS] Fix sub-windows opening in fullscreen.
Diffstat (limited to 'platform/macos/display_server_macos.mm')
| -rw-r--r-- | platform/macos/display_server_macos.mm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 3aff5b8b7e..a3bee13f69 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -2348,9 +2348,6 @@ void DisplayServerMacOS::reparent_check(WindowID p_window) { if (parent_screen == screen) { if (![[wd_parent.window_object childWindows] containsObject:wd.window_object]) { - if (wd.exclusive) { - ERR_FAIL_COND_MSG([[wd_parent.window_object childWindows] count] > 0, "Transient parent has another exclusive child."); - } [wd.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary]; [wd_parent.window_object addChildWindow:wd.window_object ordered:NSWindowAbove]; } @@ -2369,9 +2366,6 @@ void DisplayServerMacOS::reparent_check(WindowID p_window) { if (child_screen == screen) { if (![[wd.window_object childWindows] containsObject:wd_child.window_object]) { - if (wd_child.exclusive) { - ERR_FAIL_COND_MSG([[wd.window_object childWindows] count] > 0, "Transient parent has another exclusive child."); - } if (wd_child.fullscreen) { [wd_child.window_object toggleFullScreen:nil]; } |