diff --git a/src/event-context.cpp b/src/event-context.cpp
index 6186bb36f4787b68113a3555e3910a183d04b865..7afe9070dd670bc5aa569b7b1620d49f7b2d3b80 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
# include "config.h"
#endif
# include "config.h"
#endif
+#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <glibmm/i18n.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"
#include "display/sp-canvas.h"
#include "xml/node-event-vector.h"
}
/**
}
/**
- * 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
* Subroutine of sp_event_context_private_root_handler().
*/
static void
@@ -371,7 +374,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
if (event_context->space_panning) {
panning = 1;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
if (event_context->space_panning) {
panning = 1;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
- GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+ GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time-1);
ret = TRUE;
}
NULL, event->button.time-1);
ret = TRUE;
}
@@ -382,7 +385,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
} else {
panning = 2;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
} else {
panning = 2;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time-1);
}
ret = TRUE;
NULL, event->button.time-1);
}
ret = TRUE;
@@ -392,7 +395,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
|| event->button.state & GDK_CONTROL_MASK) {
panning = 3;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
|| event->button.state & GDK_CONTROL_MASK) {
panning = 3;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
NULL, event->button.time);
ret = TRUE;
} else {
NULL, event->button.time);
ret = TRUE;
} else {
@@ -522,8 +525,10 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
case GDK_D:
case GDK_d:
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:
break;
case GDK_W:
case GDK_w:
@@ -1048,7 +1053,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node */*shape_repr*/, gchar const *na
SPEventContext *ec = SP_EVENT_CONTEXT(data);
if (ec->shape_knot_holder) {
SPEventContext *ec = SP_EVENT_CONTEXT(data);
if (ec->shape_knot_holder) {
- sp_knot_holder_destroy(ec->shape_knot_holder);
+ delete ec->shape_knot_holder;
}
ec->shape_knot_holder = NULL;
}
ec->shape_knot_holder = NULL;