[Bf-blender-cvs] [3600622] master: GHOST: cover now both win and osx case for T39153

Jens Verwiebe noreply at git.blender.org
Thu Mar 13 18:03:14 CET 2014


Commit: 36006220c31b2cf5c49c126b89ddc11c024451d2
Author: Jens Verwiebe
Date:   Thu Mar 13 18:02:50 2014 +0100
https://developer.blender.org/rB36006220c31b2cf5c49c126b89ddc11c024451d2

GHOST: cover now both win and osx case for T39153

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

M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 1268e43..9fa64bf 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 */




More information about the Bf-blender-cvs mailing list