No more NRMatrix or NRPoint.

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index a8d694779bb7991af1d421f7228e94ed06bf5e99..cbb923d41a877d9b0d140687e1196758c0c85769 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -282,24 +282,24 @@ void sp_knot_start_dragging(SPKnot *knot, NR::Point p, gint x, gint y, guint32 e
 /**
  * Called to handle events on knots.
  */
-static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
+static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot)
 {
     g_assert(knot != NULL);
     g_assert(SP_IS_KNOT(knot));
 
-    g_object_ref(knot);
-    tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+    /* Run client universal event handler, if present */
 
     gboolean consumed = FALSE;
 
-    /* Run client universal event handler, if present */
-
     g_signal_emit(knot, knot_signals[EVENT], 0, event, &consumed);
 
     if (consumed) {
         return TRUE;
     }
 
+    g_object_ref(knot);
+    tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+
     switch (event->type) {
        case GDK_2BUTTON_PRESS:
             if (event->button.button == 1) {
@@ -311,14 +311,14 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
             }
             break;
        case GDK_BUTTON_PRESS:
-            if (event->button.button == 1) {
+            if (event->button.button == 1 && !knot->desktop->event_context->space_panning) {
                 NR::Point const p = knot->desktop->w2d(NR::Point(event->button.x, event->button.y));
                 sp_knot_start_dragging(knot, p, (gint) event->button.x, (gint) event->button.y, event->button.time);
                 consumed = TRUE;
             }
             break;
        case GDK_BUTTON_RELEASE:
-            if (event->button.button == 1) {
+            if (event->button.button == 1 && !knot->desktop->event_context->space_panning) {
                 knot->pressure = 0;
                 if (transform_escaped) {
                     transform_escaped = false;
@@ -347,7 +347,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
             }
             break;
        case GDK_MOTION_NOTIFY:
-            if (grabbed) {
+            if (grabbed && !knot->desktop->event_context->space_panning) {
                 consumed = TRUE;
 
                 if ( within_tolerance
@@ -379,6 +379,9 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
                 NR::Point p = motion_dt - knot->grabbed_rel_pos;
                 sp_knot_request_position (knot, &p, event->motion.state);
                 knot->desktop->scroll_to_point (&motion_dt);
+                knot->desktop->set_coordinate_status(knot->pos); // display the coordinate of knot, not cursor - they may be different!
+                if (event->motion.state & GDK_BUTTON1_MASK)
+                    gobble_motion_events(GDK_BUTTON1_MASK);
                 moved = TRUE;
             }
             break;