[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20515] branches/blender2.5/blender/source /blender/windowmanager/intern: * fix for resetting window size on builtin b .blend startup.

[Matt Ebb]

Revision: 20515
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20515
Author:   broken
Date:     2009-05-30 09:26:45 +0200 (Sat, 30 May 2009)

Log Message:
-----------
* fix for resetting window size on builtin b.blend startup.

I think this should work ok for now, but would really appreciate someone who knows the windowmanager code well to take a look at it  :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c	2009-05-30 06:23:17 UTC (rev 20514)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c	2009-05-30 07:26:45 UTC (rev 20515)
@@ -136,12 +136,12 @@
 	if(wm==NULL) return;
 	if(wm->windows.first==NULL) return;
 	
-	win = wm->windows.first;
-	win->sizex = 0;
-	win->sizey = 0;
-	win->posx = 0;
-	win->posy = 0;
-	win->windowstate= GHOST_kWindowStateMaximized;
+	for(win= wm->windows.first; win; win= win->next) {
+		win->sizex = 0;
+		win->sizey = 0;
+		win->posx = 0;
+		win->posy = 0;
+	}
 
 }
 

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-05-30 06:23:17 UTC (rev 20514)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-05-30 07:26:45 UTC (rev 20515)
@@ -302,9 +302,6 @@
 	/* prevent loading no UI */
 	G.fileflags &= ~G_FILE_NO_UI;
 	
-	if (from_memory)
-		wm_clear_default_size(C);
-	
 	/* put aside screens to match with persistant windows later */
 	wm_window_match_init(C, &wmbase); 
 	
@@ -312,6 +309,7 @@
 		success = BKE_read_file(C, tstr, NULL, NULL);
 	} else {
 		success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL, NULL);
+		if (wmbase.first == NULL) wm_clear_default_size(C);
 	}
 	
 	/* match the read WM with current WM */