diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2014-10-10 14:56:58 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-10-10 14:58:52 +0400 |
commit | fd6537a53a7e1c608d7ea709127da831ec7f1860 (patch) | |
tree | 8782f0f1f449f3807c8d6ddb8c6d381e581a0921 /intern | |
parent | e640b4fb72dbf19d5e839abb83e5ebb6532a9d30 (diff) |
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.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 52436d38e5c..8805dc93179 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; |