summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/dialog.cpp
diff options
context:
space:
mode:
authorEduard Braun <Eduard.Braun2@gmx.de>2017-06-18 17:54:03 +0000
committerEduard Braun <eduard.braun2@gmx.de>2017-06-23 21:55:03 +0000
commit46fd67ec49c3988db20db422061a2f52582c896c (patch)
treea302a68c1694ffa59872d0b50f611f97f68981ec /src/ui/dialog/dialog.cpp
parentMerge branch 'ui-files-for-ui-xml' (diff)
downloadinkscape-46fd67ec49c3988db20db422061a2f52582c896c.tar.gz
inkscape-46fd67ec49c3988db20db422061a2f52582c896c.zip
Improve and simplify shortcut handling.
Should fix many issues with unusuable keys, especially on non-English keyboard layouts.
Diffstat (limited to 'src/ui/dialog/dialog.cpp')
-rw-r--r--src/ui/dialog/dialog.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 27a6e55d9..f36b13d9b 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -266,13 +266,7 @@ bool Dialog::_onEvent(GdkEvent *event)
bool Dialog::_onKeyPress(GdkEventKey *event)
{
unsigned int shortcut;
- shortcut = Inkscape::UI::Tools::get_group0_keyval(event) |
- ( event->state & GDK_SHIFT_MASK ?
- SP_SHORTCUT_SHIFT_MASK : 0 ) |
- ( event->state & GDK_CONTROL_MASK ?
- SP_SHORTCUT_CONTROL_MASK : 0 ) |
- ( event->state & GDK_MOD1_MASK ?
- SP_SHORTCUT_ALT_MASK : 0 );
+ shortcut = sp_shortcut_get_for_event((GdkEventKey*)event);
return sp_shortcut_invoke(shortcut, SP_ACTIVE_DESKTOP);
}