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

diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index e247c0451..41e2cdb07 100644
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -7,7 +7,7 @@
  *   Frank Felfe <innerspace@iname.com>
  *   Carl Hetherington <inkscape@carlh.net>
  *
- * Copyright (C) 1999-2002 Authors 
+ * Copyright (C) 1999-2002 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -22,24 +22,36 @@ 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;
-    
+
+    if ( NULL == _named_view || ThisSnapperMightSnap() == false) {
+        return s;
+    }
+
     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;
 }
 
+/**
+ *  \return true if this Snapper will snap at least one kind of point.
+ */
+bool Inkscape::GuideSnapper::ThisSnapperMightSnap() const
+{
+    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
+{
+    SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line);
+    sc.guide_lines.push_back(dummy);
+}
+
 /*
   Local Variables:
   mode:c++