diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-11 17:52:26 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-11 17:52:26 +0000 |
| commit | 558fb7230c83dfffc8994cacf7a2955beb3d88a1 (patch) | |
| tree | 0a49236e2b0ce9626863f6f487acb99aea30e64d /src/helper/window.cpp | |
| parent | Improve revision format (diff) | |
| parent | Only update shortcuts tree view once after updating (significantly reduces th... (diff) | |
| download | inkscape-558fb7230c83dfffc8994cacf7a2955beb3d88a1.tar.gz inkscape-558fb7230c83dfffc8994cacf7a2955beb3d88a1.zip | |
Merge branch 'shortcuts' (!41)
Diffstat (limited to 'src/helper/window.cpp')
| -rw-r--r-- | src/helper/window.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/helper/window.cpp b/src/helper/window.cpp index 270f9a3c8..28fc25606 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -13,26 +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_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 ? - SP_SHORTCUT_ALT_MASK : 0 ); + shortcut = sp_shortcut_get_for_event(event); return sp_shortcut_invoke (shortcut, SP_ACTIVE_DESKTOP); } |