summaryrefslogtreecommitdiffstats
path: root/src/helper/window.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-06-29 15:49:40 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2017-06-29 15:49:40 +0000
commitb0f397d482c39849dbad823e5375272d49817f3c (patch)
tree2686321c88a28a288efec610970f49b18505aa12 /src/helper/window.cpp
parentMerge branch 'master' of gitlab.com:inkscape/inkscape (diff)
parentAllows one to use Super, Hyper and Meta key modifiers in shortcuts (diff)
downloadinkscape-b0f397d482c39849dbad823e5375272d49817f3c.tar.gz
inkscape-b0f397d482c39849dbad823e5375272d49817f3c.zip
Merge commit 'd79cc2caf6'
Diffstat (limited to 'src/helper/window.cpp')
-rw-r--r--src/helper/window.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/helper/window.cpp b/src/helper/window.cpp
index 98e886a38..270f9a3c8 100644
--- a/src/helper/window.cpp
+++ b/src/helper/window.cpp
@@ -23,6 +23,12 @@ static bool on_window_key_press(GdkEventKey* event)
shortcut = Inkscape::UI::Tools::get_group0_keyval (event) |
( event->state & GDK_SHIFT_MASK ?
SP_SHORTCUT_SHIFT_MASK : 0 ) |
+ ( event->state & GDK_SUPER_MASK ?
+ SP_SHORTCUT_SUPER_MASK : 0 ) |
+ ( event->state & GDK_HYPER_MASK ?
+ SP_SHORTCUT_HYPER_MASK : 0 ) |
+ ( event->state & GDK_META_MASK ?
+ SP_SHORTCUT_META_MASK : 0 ) |
( event->state & GDK_CONTROL_MASK ?
SP_SHORTCUT_CONTROL_MASK : 0 ) |
( event->state & GDK_MOD1_MASK ?