[Bf-blender-cvs] [33d89e482b9] blender2.8: Revert "UI: start maximized on X11 if possible, like other platforms."

Brecht Van Lommel noreply at git.blender.org
Thu Oct 4 18:53:02 CEST 2018


Commit: 33d89e482b9a4f0fca3366f1482b83be178a2652
Author: Brecht Van Lommel
Date:   Thu Oct 4 18:51:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB33d89e482b9a4f0fca3366f1482b83be178a2652

Revert "UI: start maximized on X11 if possible, like other platforms."

This reverts commit ac0dfcced30a75fed4017c0b5e1dc8600e6f1dd8.

===================================================================

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 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
 	}



More information about the Bf-blender-cvs mailing list