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:
authorCampbell Barton <ideasman42@gmail.com>2009-11-30 16:58:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-11-30 16:58:27 +0300
commitab4a141560a221860cfce00c878d8fd0cff47b9c (patch)
tree5be9aec7fb1ed3bf59d34e0a2dac893f2f9e2269
parent0f24af750680f7467433f1522d69a4fcc835fc93 (diff)
bugfix [#20083] Wrong position of splash screen on dualhead
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c6
-rw-r--r--source/creator/creator.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index d5fe9d324c4..d62ed7dd13a 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -160,7 +160,11 @@ void WM_init_splash(bContext *C)
wmWindow *prevwin= CTX_wm_window(C);
if(wm->windows.first) {
- CTX_wm_window_set(C, wm->windows.first);
+ CTX_wm_window_set(C, wm->windows.first);
+
+ /* needed to get the right screen size for centering the splash */
+ wm_window_process_events(C);
+
WM_operator_name_call(C, "WM_OT_splash", WM_OP_INVOKE_DEFAULT, NULL);
CTX_wm_window_set(C, prevwin);
}
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 3a9ee9859e8..f17cb95fe3f 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -890,8 +890,11 @@ int main(int argc, char **argv)
WM_exit(C);
}
- if(!G.background && !file_loaded)
+ if(!G.background && !file_loaded) {
+ /* careful, calls wm_window_process_events but seems safe
+ * since its called first in WM_main */
WM_init_splash(C);
+ }
WM_main(C);