Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-05-05 00:58:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-05-05 00:58:58 +0300
commitd8133b3eb99ac7ccc420d54a6a52a3f750e497ac (patch)
tree1bbf36751811a66b5a8b5a45509fd61c6f0a148e /source/blender/windowmanager
parentac6be6759ecc6c6503e8785ee405c003e0ca2fe5 (diff)
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.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c5
1 files changed, 3 insertions, 2 deletions
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);