Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevgeny Makarov <jenkm>2020-08-26 17:27:05 +0300
committerJulian Eisel <julian@blender.org>2020-08-31 14:26:23 +0300
commit0330d1af29c067cf309e4798f5259e01a8c3c668 (patch)
tree06e8ca58d0ac07a9b60bd459255fa8e941b92e9a
parentcb0b0416f454419cd1902434f7dffa2682417a56 (diff)
Fix T77900: File Browser in macOS fullscreen crashesv2.90.0
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.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 62b0e48a7c1..f8e2f96d111 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];
}