Fixing preview/swatch sizes.

[inkscape.git] / src / event-context.cpp

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 6186bb36f4787b68113a3555e3910a183d04b865..f482c99fb0dc6d0880591e0c37e4d19f6ee9fde8 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -27,10 +27,13 @@
 # include "config.h"
 #endif
 
+#include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
@@ -281,7 +284,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,8 +525,10 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
 
                 case GDK_D:
                 case GDK_d:
-                    sp_toggle_dropper(desktop);
-                    ret = TRUE;
+                    if (!MOD__SHIFT && !MOD__CTRL && !MOD__ALT) {
+                        sp_toggle_dropper(desktop);
+                        ret = TRUE;
+                    }
                     break;
                 case GDK_W:
                 case GDK_w: