[Bf-blender-cvs] [d8133b3eb99] blender-v2.83-release: Fix T76318: lower part of new preferences window does not work

Brecht Van Lommel noreply at git.blender.org
Tue May 5 02:03:15 CEST 2020


Commit: d8133b3eb99ac7ccc420d54a6a52a3f750e497ac
Author: Brecht Van Lommel
Date:   Mon May 4 23:58:58 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBd8133b3eb99ac7ccc420d54a6a52a3f750e497ac

Fix T76318: lower part of new preferences window does not work

Regression after recent changes. The precise cause is unclear to me, but
we do not need to update the size right after creating a new window.

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

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 2a5fdc0ab74..8fb7e47cd45 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -953,7 +953,8 @@ wmWindow *WM_window_open_temp(bContext *C,
 
   /* make window active, and validate/resize */
   CTX_wm_window_set(C, win);
-  if (!win->ghostwin) {
+  const bool new_window = (win->ghostwin == NULL);
+  if (new_window) {
     wm_window_ghostwindow_ensure(wm, win, dialog);
   }
   WM_check(C);
@@ -972,7 +973,7 @@ wmWindow *WM_window_open_temp(bContext *C,
 
   ED_screen_change(C, screen);
 
-  if (win->ghostwin) {
+  if (!new_window) {
     /* Set size in GHOST window and then update size and position from GHOST,
      * in case they where changed by GHOST to fit the monitor/screen. */
     wm_window_set_size(win, win->sizex, win->sizey);



More information about the Bf-blender-cvs mailing list