diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 13:12:25 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 13:12:25 +0000 |
| commit | f4a9680414ed93edc2773df843b8122552f11b3e (patch) | |
| tree | 097047806ff6bdd3ee70813c9c9059b499d3fc76 /src/shortcuts.cpp | |
| parent | Merge branch 'master' into shortcuts (diff) | |
| download | inkscape-f4a9680414ed93edc2773df843b8122552f11b3e.tar.gz inkscape-f4a9680414ed93edc2773df843b8122552f11b3e.zip | |
Add Super, Hyper and Meta keys to get in sync with d79cc2caf65007ac9d1d59886785ded5d5ac44a8
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 4bfdff34a..dc6c885c0 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -158,7 +158,10 @@ guint sp_shortcut_translate_event(GdkEventKey const *event, guint *effective_mod remaining_modifiers = initial_modifiers & ~consumed_modifiers; resulting_modifiers = ( remaining_modifiers & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) | ( remaining_modifiers & GDK_CONTROL_MASK ? SP_SHORTCUT_CONTROL_MASK : 0 ) | - ( remaining_modifiers & GDK_MOD1_MASK ? SP_SHORTCUT_ALT_MASK : 0 ); + ( remaining_modifiers & GDK_SUPER_MASK ? SP_SHORTCUT_SUPER_MASK : 0 ) | + ( remaining_modifiers & GDK_HYPER_MASK ? SP_SHORTCUT_HYPER_MASK : 0 ) | + ( remaining_modifiers & GDK_META_MASK ? SP_SHORTCUT_META_MASK : 0 ) | + ( remaining_modifiers & GDK_MOD1_MASK ? SP_SHORTCUT_ALT_MASK : 0 ); // enforce the Shift modifier for uppercase letters (otherwise plain A and Shift+A are equivalent) // for characters that are not letters both (is_upper and is_lower) return TRUE, so the condition is false |