diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-03-23 20:08:02 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-03-23 20:08:02 +0400 |
| commit | c79b923c1d3b4b61bb133a525333ade8f2e7dc08 (patch) | |
| tree | edcf5a067ae811e3c85d02883db3559969ab73bd /intern | |
| parent | 5a87e4d255477e16fb93f805c58f35496faa52ee (diff) | |
Bug fix 34743
Mac OS X full screen: the old option to go full screen now didn't hide the
dock/topbar anymore. Also made it use dock auto-hide now, not permanent hide.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index e1f3f816205..795b5200ae2 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -624,8 +624,9 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( NSStringPboardType, NSTIFFPboardType, nil]]; #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 - [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen)]; - [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; + if (state != GHOST_kWindowStateFullScreen) { + [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; + } #endif if (state == GHOST_kWindowStateFullScreen) @@ -969,9 +970,9 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 //10.6 provides Cocoa functions to autoshow menu bar, and to change a window style - //Hide menu & dock if needed + //Hide menu & dock if on primary screen. else only menu if ([[m_window screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) { - [NSApp setPresentationOptions:(NSApplicationPresentationHideDock | NSApplicationPresentationAutoHideMenuBar)]; + [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; } //Make window borderless and enlarge it [m_window setStyleMask:NSBorderlessWindowMask]; |