diff options
| author | Yevgeny Makarov <jenkm> | 2020-08-26 17:27:05 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-09-02 15:58:42 +0300 |
| commit | c4b9e2da8c3c12e69b9a7eab8d9f8a12e65dccaa (patch) | |
| tree | 942cd26143eb946a4d77ced9b140cc01e5c8e6f4 | |
| parent | 521ae3d458adcce73e5f9832fd6e7197721e9df0 (diff) | |
Fix T77900: File Browser in macOS fullscreen crashes
When Blender is started in fullscreen mode from the command line,
or if the fullscreen state is saved in the startup file, all temporary windows
will also open in fullscreen mode. When closing the fullscreen File Browser,
Blender would either crash or parent window becomes black.
This does not happen if the Blender switches to full screen manually.
`NSWindowCollectionBehaviorFullScreenPrimary` should be set for windows that
can enter full-screen mode. Otherwise macOS will turn the wrong window into
full-screen.
Similar fix: rB4b39de677d20
Differential Revision: https://developer.blender.org/D8708
Reviewed by: Julian Eisel
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 278147c5622..da84dc86b80 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -415,7 +415,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa, [parentWindow->getCocoaWindow() addChildWindow:m_window ordered:NSWindowAbove]; [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary]; } - else if (state != GHOST_kWindowStateFullScreen) { + else { [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; } |