[mutter] events: Process modifier+scroll after keybindings

[Marge Bot <marge-bot src gnome org>]

commit ac3d9a0641ee28fb727c28037570018f783defd0
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Jan 30 12:25:26 2021 +0100

    events: Process modifier+scroll after keybindings
    
    Allowing the keybindings code to see the event enables it to
    process it for its internal modifier-only-pressed state.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1695>

 src/core/events.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/core/events.c b/src/core/events.c
index 2edbeb00cd..7c23ac1740 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -269,18 +269,6 @@ meta_display_handle_event (MetaDisplay        *display,
         }
     }
 
-  if (event->type == CLUTTER_SCROLL && meta_prefs_get_mouse_button_mods () > 0)
-    {
-      ClutterModifierType grab_mods;
-
-      grab_mods = meta_display_get_compositor_modifiers (display);
-      if ((clutter_event_get_state (event) & grab_mods) != 0)
-        {
-          bypass_wayland = TRUE;
-          goto out;
-        }
-    }
-
   if (event->type != CLUTTER_DEVICE_ADDED &&
       event->type != CLUTTER_DEVICE_REMOVED)
     {
@@ -384,6 +372,18 @@ meta_display_handle_event (MetaDisplay        *display,
         }
     }
 
+  if (event->type == CLUTTER_SCROLL && meta_prefs_get_mouse_button_mods () > 0)
+    {
+      ClutterModifierType grab_mods;
+
+      grab_mods = meta_display_get_compositor_modifiers (display);
+      if ((clutter_event_get_state (event) & grab_mods) != 0)
+        {
+          bypass_wayland = TRUE;
+          goto out;
+        }
+    }
+
   if (display->current_pad_osd)
     {
       bypass_wayland = TRUE;