Removed use of union in paint type/struct

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index dd773ca75e3f01ed8d25f2b9140fd336e6538156..d8b3548d772ee09642e4546b5887511a25ce9490 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -287,19 +287,19 @@ 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);
-
-    bool consumed = FALSE;
-
     /* Run client universal event handler, if present */
 
+    gboolean consumed = FALSE;
+
     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) {
@@ -379,6 +379,7 @@ 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!
                 moved = TRUE;
             }
             break;
@@ -505,7 +506,7 @@ void sp_knot_request_position(SPKnot *knot, NR::Point *p, guint state)
     g_return_if_fail(knot != NULL);
     g_return_if_fail(SP_IS_KNOT(knot));
 
-    bool done = FALSE;
+    gboolean done = FALSE;
 
     g_signal_emit(knot,
                   knot_signals[REQUEST], 0,