[Bf-blender-cvs] [ac0dfcced30] blender2.8: UI: start maximized on X11 if possible, like other platforms.
Brecht Van Lommel
noreply at git.blender.org
Mon Oct 1 17:36:17 CEST 2018
Commit: ac0dfcced30a75fed4017c0b5e1dc8600e6f1dd8
Author: Brecht Van Lommel
Date: Mon Oct 1 17:23:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBac0dfcced30a75fed4017c0b5e1dc8600e6f1dd8
UI: start maximized on X11 if possible, like other platforms.
===================================================================
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 4363591299e..6d368cc593a 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -732,14 +732,16 @@ void wm_window_ghostwindows_ensure(wmWindowManager *wm)
wm_init_state.start_y = 0;
#ifdef WITH_X11 /* X11 */
- /* 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;
+ if (wm_init_state.size_x == 0 || wm_init_state.size_y == 0) {
+ /* 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
}
More information about the Bf-blender-cvs
mailing list