summaryrefslogtreecommitdiffstats
path: root/src/event-context.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2007-12-20 03:22:08 +0000
committercilix42 <cilix42@users.sourceforge.net>2007-12-20 03:22:08 +0000
commit33542b7c365d18d32615fe28bac1080e93543f0e (patch)
treecbad29c5021dedc121990d88446994ade13a627e /src/event-context.cpp
parentMake Shift+Ctrl+D (Document Properties dialog) work again (was shadowed by th... (diff)
downloadinkscape-33542b7c365d18d32615fe28bac1080e93543f0e.tar.gz
inkscape-33542b7c365d18d32615fe28bac1080e93543f0e.zip
(Hopefully) proper fix this time for stolen 'D + modifier' shortcuts.
(bzr r4263)
Diffstat (limited to 'src/event-context.cpp')
-rw-r--r--src/event-context.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 95b840b94..25abe965b 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -281,7 +281,7 @@ sp_toggle_selector(SPDesktop *dt)
}
/**
- * Toggles current tool between active tool and selector tool.
+ * Toggles current tool between active tool and dropper tool.
* Subroutine of sp_event_context_private_root_handler().
*/
static void
@@ -522,12 +522,10 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
case GDK_D:
case GDK_d:
- if (MOD__SHIFT && MOD__CTRL) {
- // don't catch Shift+Ctrl+D (Document Properties dialog)
- break;
+ if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+ sp_toggle_dropper(desktop);
+ ret = TRUE;
}
- sp_toggle_dropper(desktop);
- ret = TRUE;
break;
case GDK_W:
case GDK_w: