From 77d5d20391ca2f236c629cffbbdbc12d9c77f5ed Mon Sep 17 00:00:00 2001
From: Viktor Zoutman <viktor.zoutman@embark-studios.com>
Date: Tue, 24 Nov 2020 23:05:29 +0100
Subject: [PATCH] Windows: Delayed Message Boxes Fix. (#1769)

---
 CHANGELOG.md                            | 1 +
 src/platform_impl/windows/event_loop.rs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7e3f8ef..8a536e60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- On Windows, fix bug causing message boxes to appear delayed.
 - On Android, calling `WindowEvent::Focused` now works properly instead of always returning false. 
 - On Windows, fix alt-tab behaviour by removing borderless fullscreen "always on top" flag.
 - On Windows, fix bug preventing windows with transparency enabled from having fully-opaque regions.
diff --git a/src/platform_impl/windows/event_loop.rs b/src/platform_impl/windows/event_loop.rs
index 27af039f..37817cb5 100644
--- a/src/platform_impl/windows/event_loop.rs
+++ b/src/platform_impl/windows/event_loop.rs
@@ -1973,7 +1973,8 @@ unsafe extern "system" fn thread_event_target_callback<T: 'static>(
                 }
             }
 
-            0
+            // Default WM_PAINT behaviour. This makes sure modals and popups are shown immediatly when opening them.
+            commctrl::DefSubclassProc(window, msg, wparam, lparam)
         }
 
         winuser::WM_INPUT_DEVICE_CHANGE => {