From: Diederik van Lierop <mailat-signdiedenrezidotnl>
Date: Fri, 12 Feb 2010 18:58:21 +0000 (+0100)
Subject: Constrained snapping: always enforce constraint, even when we didn't snap
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=439aa20df71746e469b934fb2a50539691279877;p=inkscape.git

Constrained snapping: always enforce constraint, even when we didn't snap
---

diff --git a/src/snap.cpp b/src/snap.cpp
index 9ee575e22..3cac53ebe 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -354,12 +354,14 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::SnapCandidatePoint
                                                     Inkscape::Snapper::ConstraintLine const &constraint,
                                                     Geom::OptRect const &bbox_to_snap) const
 {
+    // First project the mouse pointer onto the constraint
+    Geom::Point pp = constraint.projection(p.getPoint());
+
     if (!someSnapperMightSnap()) {
-        return Inkscape::SnappedPoint(p, Inkscape::SNAPTARGET_UNDEFINED, NR_HUGE, 0, false, false);
+        // The constraint should always be enforce, so we return pp here instead of p
+        return Inkscape::SnappedPoint(pp, Inkscape::SNAPTARGET_UNDEFINED, NR_HUGE, 0, false, false);
     }
 
-    // First project the mouse pointer onto the constraint
-    Geom::Point pp = constraint.projection(p.getPoint());
     // Then try to snap the projected point
     Inkscape::SnapCandidatePoint candidate(pp, p.getSourceType(), p.getSourceNum(), Inkscape::SNAPTARGET_UNDEFINED, Geom::Rect());