index 4225dd9e3b19eb15292f8865bc967e527ce6db3a..bf7505f3c0afc64c6003f62d30bbf83906929107 100644 (file)
{
Geom::Matrix const i2d (sp_item_i2d_affine(item));
Geom::Point s = p * i2d;
+
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, item);
+
m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, s, Inkscape::SNAPSOURCE_HANDLE);
+
return s * i2d.inverse();
}
@@ -102,10 +105,28 @@ KnotHolderEntity::snap_knot_position_constrained(Geom::Point const &p, Inkscape:
{
Geom::Matrix const i2d (sp_item_i2d_affine(item));
Geom::Point s = p * i2d;
- Inkscape::Snapper::ConstraintLine transformed_constraint = Inkscape::Snapper::ConstraintLine(constraint.getPoint() * i2d, (constraint.getPoint() + constraint.getDirection()) * i2d - constraint.getPoint() * i2d);
+
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, item);
- m.constrainedSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, s, Inkscape::SNAPSOURCE_HANDLE, transformed_constraint);
+
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if ((prefs->getBool("/options/snapmousepointer/value", false))) { // legacy behavior (pre v0.47)
+ // Snapping the mouse pointer instead of the constrained position of the knot allows to snap to
+ // things which don't intersect with the constraint line. This should be handled by the
+ // smart dynamic guides which are yet to be implemented, making this behavior more clean and
+ // transparent. With the current implementation it leads to unexpected results, and it doesn't
+ // allow accurately controlling what is being snapped to.
+
+ // freeSnap() will try snapping point p. This will not take into account the constraint, which
+ // is therefore to be enforced after snap_knot_position_constrained() has finished
+ m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, s, Inkscape::SNAPSOURCE_HANDLE);
+ } else {
+ // constrainedSnap() will first project the point p onto the constraint line and then try to snap along that line.
+ // This way the constraint is already enforced, no need to worry about that later on
+ Inkscape::Snapper::ConstraintLine transformed_constraint = Inkscape::Snapper::ConstraintLine(constraint.getPoint() * i2d, (constraint.getPoint() + constraint.getDirection()) * i2d - constraint.getPoint() * i2d);
+ m.constrainedSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, s, Inkscape::SNAPSOURCE_HANDLE, transformed_constraint);
+ }
+
return s * i2d.inverse();
}