diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-04 19:51:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-04 19:52:55 +0300 |
| commit | 33d89e482b9a4f0fca3366f1482b83be178a2652 (patch) | |
| tree | 800ffe1e46a9ad2498aaf0803a11fe498fc5a6b6 /source/blender/windowmanager | |
| parent | ee6c8be1834a64bd5ba20400908999750bf8cd8d (diff) | |
Revert "UI: start maximized on X11 if possible, like other platforms."
This reverts commit ac0dfcced30a75fed4017c0b5e1dc8600e6f1dd8.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 6d368cc593a..679b45628b1 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -732,16 +732,16 @@ void wm_window_ghostwindows_ensure(wmWindowManager *wm) wm_init_state.start_y = 0; #ifdef WITH_X11 /* X11 */ - 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; - } + /* X11, don't start maximized because we can't figure out the dimensions + * of a single display yet if there are multiple, due to lack of Xinerama + * handling in GHOST. */ + 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 } |