diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-11-29 09:11:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-29 09:11:18 +0100 |
commit | f0b43678c45d1f692bef100eaf29cd91cf7ef6c8 (patch) | |
tree | 654a5b9e81c079238f66ffb8b6fdfc206e7dbede | |
parent | aac4cde229f9d4dc1fbc35955cf934a749cb9d95 (diff) | |
parent | 7f26fba8cbc532cd282a7e73753ae23bca1f36bc (diff) |
Merge pull request #13383 from Krakean/fix_whitescreen
Fixed fleeting window white screen on editor/game startup
-rw-r--r-- | platform/windows/os_windows.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 284dfaf904..7c1f733974 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1044,12 +1044,6 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } - if (!is_no_window_mode_enabled()) { - ShowWindow(hWnd, SW_SHOW); // Show The Window - SetForegroundWindow(hWnd); // Slightly Higher Priority - SetFocus(hWnd); // Sets Keyboard Focus To - } - /* DEVMODE dmScreenSettings; // Device Mode memset(&dmScreenSettings,0,sizeof(dmScreenSettings)); // Makes Sure Memory's Cleared @@ -1087,6 +1081,12 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int DragAcceptFiles(hWnd, true); move_timer_id = 1; + + if (!is_no_window_mode_enabled()) { + ShowWindow(hWnd, SW_SHOW); // Show The Window + SetForegroundWindow(hWnd); // Slightly Higher Priority + SetFocus(hWnd); // Sets Keyboard Focus To + } } void OS_Windows::set_clipboard(const String &p_text) { |