diff options
| author | Eduard Braun <Eduard.Braun2@gmx.de> | 2017-06-18 17:54:03 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-06-23 21:55:03 +0000 |
| commit | 46fd67ec49c3988db20db422061a2f52582c896c (patch) | |
| tree | a302a68c1694ffa59872d0b50f611f97f68981ec /src/helper/window.cpp | |
| parent | Merge branch 'ui-files-for-ui-xml' (diff) | |
| download | inkscape-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/helper/window.cpp')
| -rw-r--r-- | src/helper/window.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/helper/window.cpp b/src/helper/window.cpp index 98e886a38..28fc25606 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -13,20 +13,12 @@ #include "desktop.h" #include "inkscape.h" #include "shortcuts.h" -#include "ui/tools/tool-base.h" #include "window.h" static bool on_window_key_press(GdkEventKey* event) { unsigned shortcut = 0; - // FIXME why? - 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(event); return sp_shortcut_invoke (shortcut, SP_ACTIVE_DESKTOP); } |