[Bf-blender-cvs] [fd6537a] master: OSX: as an prerequisite to make Dalai's upcoming "area_fullsceen" work, make sure the window states are correct in the lion_fs animation phase. This also assures the CTX_wm_window(C) is okay.

[Jens Verwiebe]

Commit: fd6537a53a7e1c608d7ea709127da831ec7f1860
Author: Jens Verwiebe
Date:   Fri Oct 10 12:56:58 2014 +0200
Branches: master
https://developer.blender.org/rBfd6537a53a7e1c608d7ea709127da831ec7f1860

OSX: as an prerequisite to make Dalai's upcoming "area_fullsceen" work,
make sure the window states are correct in the lion_fs animation phase.
This also assures the CTX_wm_window(C) is okay.

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.mm

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 52436d3..8805dc9 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -870,7 +870,12 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
 
 	if (masks & NSFullScreenWindowMask) {
 		// Lion style fullscreen
-		state = GHOST_kWindowStateFullScreen;
+        if (!m_immediateDraw) {
+            state = GHOST_kWindowStateFullScreen;
+        }
+        else {
+            state = GHOST_kWindowStateNormal;
+        }
 	}
 	else
 #endif
@@ -884,7 +889,12 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
 		state = GHOST_kWindowStateMaximized;
 	}
 	else {
+        if (m_immediateDraw) {
+            state = GHOST_kWindowStateFullScreen;
+        }
+        else {
 		state = GHOST_kWindowStateNormal;
+        }
 	}
 	[pool drain];
 	return state;