Don't snap node handles to the parent path, plus a small string change

diff --git a/src/nodepath.cpp b/src/nodepath.cpp
index 29a6f94cfab028e0f062cc0cc54310bbd827e190..09c030aecc119c16b26430cb16118b2971491f32 100644 (file)
--- a/src/nodepath.cpp
+++ b/src/nodepath.cpp
@@ -3455,9 +3455,9 @@ static gboolean node_handle_request(SPKnot *knot, NR::Point *p, guint state, gpo
             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), NULL).getPoint();
+        *p = m.constrainedSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, Inkscape::Snapper::ConstraintLine(*p, ndelta), SP_ITEM(n->subpath->nodepath->object)).getPoint();
     } else {
-        *p = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, NULL).getPoint();
+        *p = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, *p, SP_ITEM(n->subpath->nodepath->object)).getPoint();
     }
 
     sp_node_adjust_handle(n, -which);

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index b62248cc3bbb1a17ddc5870fe64a5f5f71e206f0..141a0c8cba857e5c79daec723c9a85b0e22c9d7b 100644 (file)
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -301,7 +301,7 @@ DocumentProperties::build_snap()
                 "guidetolerance", _wr);
                 
     //Some other options
-    _rcbic.init (_("_Include the object's center"),
+    _rcbic.init (_("_Include the object's rotation center"),
                 _("Also snap the rotation center of an object when snapping nodes or guides"),
                 "inkscape:snap-center", _wr);
                 //Applies to both nodes and guides, but not to bboxes, that's why its located here