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:
authorJens Verwiebe <info@jensverwiebe.de>2014-10-14 14:48:06 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-15 15:53:39 +0400
commit804005650ec961ba2200e34f5ef6fe590c210699 (patch)
tree8bbcd4bf46a2691ea8e964335d182f06743c079f
parent576425735e85a1f7f778b1720c6974a7652ccc36 (diff)
OSX: only use lionstylefullscreen when seperate spaces are used, todo: use respondsToSelector to simplify the whole detection
-rw-r--r--intern/ghost/intern/GHOST_WindowCocoa.mm9
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index ec8be151d6e..328bb37249b 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -728,12 +728,15 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
if (state == GHOST_kWindowStateFullScreen)
setState(GHOST_kWindowStateFullScreen);
- //Starting with 10.9 (darwin 13.x.x), we always use Lion fullscreen, since it
- //now has proper multi-monitor support for fullscreen
+ // Starting with 10.9 (darwin 13.x.x), we always use Lion fullscreen, since it
+ // now has better multi-monitor support for fullscreen
+ // if the screens are spawned, additional screens get useless,
+ // so we only use lionStyleFullScreen when screens have separate spaces
+
char darwin_ver[10];
size_t len = sizeof(darwin_ver);
sysctlbyname("kern.osrelease", &darwin_ver, &len, NULL, 0);
- if(darwin_ver[0] == '1' && darwin_ver[1] >= '3') {
+ if(darwin_ver[0] == '1' && darwin_ver[1] >= '3' && [NSScreen screensHaveSeparateSpaces]) {
m_lionStyleFullScreen = true;
}