(Hopefully) proper fix this time for stolen 'D + modifier' shortcuts.

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 95b840b94e0eb71aefdad6b58876090da4b5c8b2..25abe965b3f8a52d6895686f8df413acb290300b 100644 (file)
--- 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: