isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

events: Process modifier+scroll after keybindings

Browse Source 
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>
This commit is contained in:
Florian Müllner 2021-01-30 12:25:26 +01:00 committed by Marge Bot
parent 7901b98808
commit ac3d9a0641
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/events.c
View File

@ -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 && if (event->type != CLUTTER_DEVICE_ADDED &&
event->type != CLUTTER_DEVICE_REMOVED) 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) if (display->current_pad_osd)
{ {
bypass_wayland = TRUE; bypass_wayland = TRUE;