diff --git a/src/star-context.cpp b/src/star-context.cpp
index b6b3c340e01a15286b10676eaf518861eb808478..c5fa5a0b975ce3907be51ad74e66e269de4da3e8 100644 (file)
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
sc->sel_changed_connection.~connection();
if (ec->shape_knot_holder) {
- sp_knot_holder_destroy (ec->shape_knot_holder);
+ delete ec->shape_knot_holder;
ec->shape_knot_holder = NULL;
}
@@ -174,7 +174,7 @@ sp_star_context_selection_changed (Inkscape::Selection * selection, gpointer dat
SPEventContext *ec = SP_EVENT_CONTEXT (sc);
if (ec->shape_knot_holder) { // desktroy knotholder
- sp_knot_holder_destroy (ec->shape_knot_holder);
+ delete ec->shape_knot_holder;
ec->shape_knot_holder = NULL;
}
@@ -279,10 +279,11 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
dragging = TRUE;
sc->center = Inkscape::setup_for_drag_start(desktop, event_context, event);
-
+
+ /* Snap center */
SnapManager &m = desktop->namedview->snap_manager;
- m.setup(desktop, sc->item);
- m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, sc->center);
+ m.setup(desktop, NULL); //null, because we don't have an item yet
+ m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, sc->center);
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
@@ -305,11 +306,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
event_context->within_tolerance = false;
NR::Point const motion_w(event->motion.x, event->motion.y);
- NR::Point motion_dt(event_context->desktop->w2d(motion_w));
-
- SnapManager &m = desktop->namedview->snap_manager;
- m.setup(desktop, sc->item);
- m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt);
+ NR::Point motion_dt(desktop->w2d(motion_w));
sp_star_drag (sc, motion_dt, event->motion.state);
sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
}
- NR::Point const p0 = sp_desktop_dt2root_xy_point(desktop, sc->center);
- NR::Point p1 = sp_desktop_dt2root_xy_point(desktop, p);
-
/* Snap corner point with no constraints */
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, sc->item);
- m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, p1);
-
+ m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, p);
+
+ NR::Point const p0 = sp_desktop_dt2root_xy_point(desktop, sc->center);
+ NR::Point p1 = sp_desktop_dt2root_xy_point(desktop, p);
+
SPStar *star = SP_STAR(sc->item);
double const sides = (gdouble) sc->magnitude;