X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fguide-snapper.cpp;h=41e2cdb0708bc480366cda9317277bb9570ec661;hb=96c274534e3b260291098b7da1875695fe5b30a7;hp=51b5e7680542d9c61471cbb9fc2dea60b4f48fd1;hpb=e1da05d7d6b8a6d4ddbca0fd1d7e633a84b2c1cf;p=inkscape.git

diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 51b5e7680..41e2cdb07 100644
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -22,7 +22,7 @@ Inkscape::GuideSnapper::GuideSnapper(SPNamedView const *nv, NR::Coord const d) :
 
 }
 
-Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(NR::Point const &p) const
+Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(NR::Point const &/*p*/) const
 {
     LineList s;
 
@@ -32,13 +32,7 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(NR::Point
 
     for (GSList const *l = _named_view->guides; l != NULL; l = l->next) {
         SPGuide const *g = SP_GUIDE(l->data);
-
-        /* We assume here that guides are horizontal or vertical */
-        if (g->normal == component_vectors[NR::X]) {
-            s.push_back(std::make_pair(NR::X, g->position));
-        } else {
-            s.push_back(std::make_pair(NR::Y, g->position));
-        }
+        s.push_back(std::make_pair(g->normal_to_line, g->point_on_line)); 
     }
 
     return s;
@@ -49,13 +43,13 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(NR::Point
  */
 bool Inkscape::GuideSnapper::ThisSnapperMightSnap() const
 {
-    return _named_view == NULL ? false : (_enabled && _snap_from != 0 && _named_view->showguides);
+    return _named_view == NULL ? false : (_snap_enabled && _snap_from != 0 && _named_view->showguides);
 }
 
 void Inkscape::GuideSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const
 {
-	SnappedInfiniteLine dummy = SnappedInfiniteLine(snapped_point, snapped_distance, normal_to_line, point_on_line);
-	sc.guide_lines.push_back(dummy);
+    SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line);
+    sc.guide_lines.push_back(dummy);
 }
 
 /*