From f7d4a52ec36be4637f749ef7fc54da9f0dc04e94 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Thu, 10 Nov 2022 09:22:02 +0100 Subject: [PATCH] GdkWin32: Do not use MA_NOACTIVATEANDEAT GTK knows when a surface is modally blocked and automatically drops button press and release events, so do not block input in advance from WM_MOUSEACTIVATE. --- gdk/win32/gdkevents-win32.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 9857095519..492fa68c4b 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2729,22 +2729,15 @@ gdk_event_translate (MSG *msg, } break; - case WM_MOUSEACTIVATE: - { - if (GDK_IS_DRAG_SURFACE (window)) - { - *ret_valp = MA_NOACTIVATE; - return_val = TRUE; - } - - if (_gdk_modal_blocked (window)) - { - *ret_valp = MA_NOACTIVATEANDEAT; - return_val = TRUE; - } - } - - break; + case WM_MOUSEACTIVATE: + if (GDK_IS_DRAG_SURFACE (window) || + _gdk_modal_blocked (window)) + { + *ret_valp = MA_NOACTIVATE; + return_val = TRUE; + } + + break; case WM_POINTERACTIVATE: if (GDK_IS_DRAG_SURFACE (window) || -- 2.30.2