[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55538] trunk/blender/intern/ghost/intern/ GHOST_WindowCocoa.mm: Bug fix 34743

Ton Roosendaal ton at blender.org
Sat Mar 23 17:08:03 CET 2013


Revision: 55538
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55538
Author:   ton
Date:     2013-03-23 16:08:02 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-23 16:03:13 UTC (rev 55537)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-23 16:08:02 UTC (rev 55538)
@@ -624,8 +624,9 @@
 										  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 @@
 
 #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];




More information about the Bf-blender-cvs mailing list