Fix T38452: on OS X 10.9, now always use Lion style fullscreen.

On earlier versions there is no proper multi-monitor support, so we leave the
choice still. But for 10.9 this just interacts better with other elements like
spaces and the dock.
This commit is contained in:
Brecht Van Lommel
2014-02-03 16:45:51 +01:00
parent 0d7586739a
commit 3314165a66

View File

@@ -1038,6 +1038,16 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
NSUInteger masks = [m_window styleMask];
if (!m_fullScreen && !(masks & NSFullScreenWindowMask)) {
/* Starting with 10.9, we always use Lion fullscreen, since it
* now has proper multi-monitor support for fullscreen */
struct { SInt32 major, minor; } systemversion;
Gestalt(gestaltSystemVersionMajor, &systemversion.major);
Gestalt(gestaltSystemVersionMinor, &systemversion.minor);
if (systemversion.major > 10 || (systemversion.major == 10 && systemversion.minor >= 9)) {
[m_window toggleFullScreen:nil];
break;
}
#else
if (!m_fullScreen) {
#endif
@@ -1100,7 +1110,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
[pool drain];
}
}
break;
}
case GHOST_kWindowStateNormal: