diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-12 18:55:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-12 18:55:52 +0400 |
| commit | f6025018f55aa668c7fcc205d0ce1d19bb415ef2 (patch) | |
| tree | e8631256d111144edc49e6f6182013dfba474bab | |
| parent | 984bd7ffa82ca4c674a7d4a6a5b5504787335533 (diff) | |
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).
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 20 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_window.h | 1 |
2 files changed, 7 insertions, 14 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index b806cdcf4c4..53698ca7e9e 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -444,11 +444,15 @@ void wm_window_add_ghostwindows(wmWindowManager *wm) #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 @@ void wm_window_add_ghostwindows(wmWindowManager *wm) 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; } diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index c4c64ed429f..a0546c88b78 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -74,6 +74,7 @@ int wm_window_fullscreen_toggle_exec(bContext *C, struct wmOperator *op); * 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__ */ |