diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-05-20 19:21:01 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-05-20 19:21:01 +0000 |
| commit | 72263c6e119314997999ce5014f1e915077b3c78 (patch) | |
| tree | b25fbb4b50d36590d1224fdde3fc6326182f5cc9 /src/star-context.cpp | |
| parent | Set of (cxx)tests for svg-path.cpp and PathString. Not (yet) part of make check. (diff) | |
| download | inkscape-72263c6e119314997999ce5014f1e915077b3c78.tar.gz inkscape-72263c6e119314997999ce5014f1e915077b3c78.zip | |
Improve snapping behaviour when creating new shapes
(bzr r5721)
Diffstat (limited to 'src/star-context.cpp')
| -rw-r--r-- | src/star-context.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/star-context.cpp b/src/star-context.cpp index b6b3c340e..1b3b1e7b0 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -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); @@ -449,14 +446,14 @@ static void sp_star_drag(SPStarContext *sc, NR::Point p, guint 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; |