Various snapping cleanups and bug fixes.

[inkscape.git] / src / line-snapper.cpp

diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index 383c1fb96725f731c9c62574a00e5422a033d095..a2c6b944bcc28ff10c36963b8fbb1bb142901cda 100644 (file)
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -35,23 +35,21 @@ Inkscape::SnappedPoint Inkscape::LineSnapper::_doFreeSnap(NR::Point const &p,
 }
 
 Inkscape::SnappedPoint Inkscape::LineSnapper::_doConstrainedSnap(NR::Point const &p,
-                                                                 NR::Point const &c,
+                                                                 ConstraintLine const &c,
                                                                  std::list<SPItem const *> const &it) const
 {
     Inkscape::SnappedPoint s = SnappedPoint(p, NR_HUGE);
 
-    NR::Point const v = NR::unit_vector(c);
-
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(p);
 
     for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
 
         /* Normal to the line we're trying to snap along */
-        NR::Point const n(NR::rot90(v));
+        NR::Point const n(NR::rot90(NR::unit_vector(c.getDirection())));
 
-        /* Hence constant term of the line we're trying to snap along */
-        NR::Coord const q = dot(n, p);
+        /* Constant term of the line we're trying to snap along */
+        NR::Coord const q = dot(n, c.hasPoint() ? c.getPoint() : p);
 
         /* Try to intersect this line with the target line */
         NR::Point t = p;