summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e24cc02)
raw | patch | inline | side by side (parent: e24cc02)
| author | johanengelen <johanengelen@users.sourceforge.net> | |
| Tue, 4 Mar 2008 20:27:20 +0000 (20:27 +0000) | ||
| committer | johanengelen <johanengelen@users.sourceforge.net> | |
| Tue, 4 Mar 2008 20:27:20 +0000 (20:27 +0000) |
| src/nodepath.cpp | patch | blob | history |
diff --git a/src/nodepath.cpp b/src/nodepath.cpp
index bc396d37845b3da19b1ffce658d8ca1682fe9527..c7e6f700125aa39d324c764c69e0555a25de7438 100644 (file)
--- a/src/nodepath.cpp
+++ b/src/nodepath.cpp
@@ -3528,7 +3528,7 @@ static gboolean node_handle_request(SPKnot *knot, NR::Point *p, guint /*state*/,
NRPathcode const othercode = sp_node_path_code_from_side(n, opposite);
SnapManager const &m = n->subpath->nodepath->desktop->namedview->snap_manager;
-
+ Inkscape::SnappedPoint s ;
if (opposite->other && (n->type != Inkscape::NodePath::NODE_CUSP) && (othercode == NR_LINETO)) {
/* We are smooth node adjacent with line */
NR::Point const delta = *p - n->pos;
@@ -3540,9 +3540,13 @@ static gboolean node_handle_request(SPKnot *knot, NR::Point *p, guint /*state*/,
NR::Coord const scal = dot(delta, ndelta) / linelen;
(*p) = n->pos + (scal / linelen) * ndelta;
}
- *p = m.constrainedSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, Inkscape::Snapper::ConstraintLine(*p, ndelta), n->subpath->nodepath->item).getPoint();
+ s = m.constrainedSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, Inkscape::Snapper::ConstraintLine(*p, ndelta), n->subpath->nodepath->item);
} else {
- *p = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, n->subpath->nodepath->item).getPoint();
+ s = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, n->subpath->nodepath->item);
+ }
+ *p = s.getPoint();
+ if (s.getDistance() < NR_HUGE) {
+ n->subpath->nodepath->desktop->snapindicator->set_new_snappoint((*p).to_2geom());
}
sp_node_adjust_handle(n, -which);