[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32493] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Fix for r32487: the logic was suboptimal, improved to always work correctly.

[Nathan Letwory]

Revision: 32493
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32493
Author:   jesterking
Date:     2010-10-15 11:30:33 +0200 (Fri, 15 Oct 2010)

Log Message:
-----------
Fix for r32487: the logic was suboptimal, improved to always work correctly.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c       
2010-10-15 09:23:18 UTC (rev 32492)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c       
2010-10-15 09:30:33 UTC (rev 32493)
@@ -68,7 +68,7 @@
 
 /* set by commandline */
 static int prefsizx= 0, prefsizy= 0, prefstax= 0, prefstay= 0, initialstate= 
GHOST_kWindowStateNormal;
-static int prefsizeused = 0;
+static unsigned short useprefsize= 0;
 
 /* ******** win open & close ************ */
 
@@ -373,13 +373,13 @@
        
        for(win= wm->windows.first; win; win= win->next) {
                if(win->ghostwin==NULL) {
-                       if(win->sizex==0 || prefsizeused==0) {
+                       if(win->sizex==0 || useprefsize) {
                                win->posx= prefstax;
                                win->posy= prefstay;
                                win->sizex= prefsizx;
                                win->sizey= prefsizy;
                                win->windowstate= initialstate;
-                               prefsizeused= 1;
+                               useprefsize= 0;
                        }
                        wm_window_add_ghostwindow(C, wm, "Blender", win);
                }
@@ -1111,6 +1111,7 @@
        prefstay= stay;
        prefsizx= sizx;
        prefsizy= sizy;
+       useprefsize= 1;
 }
 
 /* for borderless and border windows set from command-line */


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs