[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55218] trunk/blender/source/blender/ windowmanager: change defaults for window state on X11 (yet again), after further discussion.

[Campbell Barton]

Revision: 55218
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55218
Author:   campbellbarton
Date:     2013-03-12 14:55:52 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
change defaults for window state on X11 (yet again), after further discussion.

instead use a fixed size as a default, clamp by the desktop size and add some padding (to account for title bar and panel).

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-03-12 14:28:52 UTC (rev 55217)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-03-12 14:55:52 UTC (rev 55218)
@@ -444,11 +444,15 @@
 #endif
 
 #if !defined(__APPLE__) && !defined(WIN32)  /* X11 */
-		/* X11, start maximized but use default same size */
+		/* X11, start maximized but use default sane size */
 		wm_init_state.size_x = min_ii(wm_init_state.size_x, WM_WIN_INIT_SIZE_X);
 		wm_init_state.size_y = min_ii(wm_init_state.size_y, WM_WIN_INIT_SIZE_Y);
+		/* pad */
+		wm_init_state.start_x = WM_WIN_INIT_PAD;
+		wm_init_state.start_y = WM_WIN_INIT_PAD;
+		wm_init_state.size_x -= WM_WIN_INIT_PAD * 2;
+		wm_init_state.size_y -= WM_WIN_INIT_PAD * 2;
 #endif
-
 	}
 	
 	for (win = wm->windows.first; win; win = win->next) {
@@ -459,19 +463,7 @@
 				win->sizex = wm_init_state.size_x;
 				win->sizey = wm_init_state.size_y;
 
-#if !defined(__APPLE__) && !defined(WIN32)  /* X11 */
-				if (wm_init_state.override_flag & WIN_OVERRIDE_GEOM) {
-					/* we can't properly resize a maximized window */
-					win->windowstate = GHOST_kWindowStateNormal;
-				}
-				else {
-					/* loading without userpref, default to maximized */
-					win->windowstate = GHOST_kWindowStateMaximized;
-				}
-#else
 				win->windowstate = GHOST_kWindowStateNormal;
-#endif
-
 				wm_init_state.override_flag &= ~WIN_OVERRIDE_GEOM;
 			}
 

Modified: trunk/blender/source/blender/windowmanager/wm_window.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_window.h	2013-03-12 14:28:52 UTC (rev 55217)
+++ trunk/blender/source/blender/windowmanager/wm_window.h	2013-03-12 14:55:52 UTC (rev 55218)
@@ -74,6 +74,7 @@
  * Clamped by real desktop limits */
 #define WM_WIN_INIT_SIZE_X 1800
 #define WM_WIN_INIT_SIZE_Y 1000
+#define WM_WIN_INIT_PAD 40
 
 #endif /* __WM_WINDOW_H__ */