AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'shifted-mnemonics' into 'master'

Browse Source 
shortcuts: Ignore consumed modifiers for mnemonics

Closes #3912

See merge request GNOME/gtk!3499
This commit is contained in:
Matthias Clasen 2021-05-02 23:51:41 +00:00
commit 687e589950
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkshortcutcontroller.c
View File

@ -432,9 +432,11 @@ gtk_shortcut_controller_handle_event (GtkEventController *controller,
if (event_type == GDK_KEY_PRESS) if (event_type == GDK_KEY_PRESS)
{ {
GdkModifierType modifiers; GdkModifierType modifiers, consumed_modifiers;
modifiers = gdk_event_get_modifier_state (event); modifiers = gdk_event_get_modifier_state (event);
enable_mnemonics = (modifiers & gtk_accelerator_get_default_mod_mask ()) == self->mnemonics_modifiers; consumed_modifiers = gdk_key_event_get_consumed_modifiers (event);
enable_mnemonics = (modifiers & ~consumed_modifiers & gtk_accelerator_get_default_mod_mask ()) == self->mnemonics_modifiers;
} }
else else
{ {