- Major refactoring of snapping related code...

- Enabling snap indicator for all remaining tools

(bzr r5556)

1 files changed, 9 insertions, 6 deletions

diff --git a/src/star-context.cpp b/src/star-context.cpp
index cee03b4b1..816e6b779 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -280,8 +280,9 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
 
             sc->center = Inkscape::setup_for_drag_start(desktop, event_context, event);
 
-            SnapManager const &m = desktop->namedview->snap_manager;
-            sc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, sc->center, sc->item).getPoint();
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop, sc->item);
+            sc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, sc->center).getPoint();
 
             sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
                                 GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
@@ -306,8 +307,9 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
             NR::Point const motion_w(event->motion.x, event->motion.y);
             NR::Point motion_dt(event_context->desktop->w2d(motion_w));
             
-            SnapManager const &m = desktop->namedview->snap_manager;
-            motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, sc->item).getPoint();
+            SnapManager &m = desktop->namedview->snap_manager;
+            m.setup(desktop, sc->item);
+            motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt).getPoint();
             
             sp_star_drag (sc, motion_dt, event->motion.state);
 
@@ -451,8 +453,9 @@ static void sp_star_drag(SPStarContext *sc, NR::Point p, guint state)
     NR::Point p1 = sp_desktop_dt2root_xy_point(desktop, p);
 
     /* Snap corner point with no constraints */
-    SnapManager const &m = desktop->namedview->snap_manager;
-    p1 = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, p1, sc->item).getPoint();
+    SnapManager &m = desktop->namedview->snap_manager;
+    m.setup(desktop, sc->item);
+    p1 = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, p1).getPoint();
 
     SPStar *star = SP_STAR(sc->item);