forked from bartvdbraak/blender
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.
This commit is contained in:
parent
e640b4fb72
commit
fd6537a53a
@ -870,7 +870,12 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
|
|||||||
|
|
||||||
if (masks & NSFullScreenWindowMask) {
|
if (masks & NSFullScreenWindowMask) {
|
||||||
// Lion style fullscreen
|
// Lion style fullscreen
|
||||||
state = GHOST_kWindowStateFullScreen;
|
if (!m_immediateDraw) {
|
||||||
|
state = GHOST_kWindowStateFullScreen;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
state = GHOST_kWindowStateNormal;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@ -884,7 +889,12 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
|
|||||||
state = GHOST_kWindowStateMaximized;
|
state = GHOST_kWindowStateMaximized;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if (m_immediateDraw) {
|
||||||
|
state = GHOST_kWindowStateFullScreen;
|
||||||
|
}
|
||||||
|
else {
|
||||||
state = GHOST_kWindowStateNormal;
|
state = GHOST_kWindowStateNormal;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
[pool drain];
|
[pool drain];
|
||||||
return state;
|
return state;
|
||||||
|
Loading…
Reference in New Issue
Block a user