diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-13 21:02:50 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-13 21:03:04 +0400 |
| commit | 36006220c31b2cf5c49c126b89ddc11c024451d2 (patch) | |
| tree | 2619848e9296d02a102da3d28eb8f1a7833ff275 /source/blender/windowmanager/intern | |
| parent | 5e56f45a6628fcb3d8077a3cfb152013b450e3d2 (diff) | |
GHOST: cover now both win and osx case for T39153
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 1268e4341bc..9fa64bf65b3 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -372,16 +372,21 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win) if (win->eventstate == NULL) win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state"); - - /* set the state */ - GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate); +#ifdef __APPLE__ + /* set the state here, else OSX would nor recignize changed screen resolution */ + GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate); +#endif /* store actual window size in blender window */ bounds = GHOST_GetClientBounds(win->ghostwin); win->sizex = GHOST_GetWidthRectangle(bounds); win->sizey = GHOST_GetHeightRectangle(bounds); GHOST_DisposeRectangle(bounds); - + +#ifndef __APPLE__ + /* set the state here, so minimized state comes up correct on windows */ + GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate); +#endif /* until screens get drawn, make it nice gray */ glClearColor(0.55, 0.55, 0.55, 0.0); /* Crash on OSS ATI: bugs.launchpad.net/ubuntu/+source/mesa/+bug/656100 */ |