Filter effects dialog:

[inkscape.git] / src / snapper.cpp

diff --git a/src/snapper.cpp b/src/snapper.cpp
index fd05809c13af5d54c10525e7a7ed96e48f1dd9b8..390e0957e983eab9f0b47b7a451d0b2b74bf17a8 100644 (file)
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -10,6 +10,8 @@
 
 #include "libnr/nr-values.h"
 #include "sp-namedview.h"
+#include "inkscape.h"
+#include "desktop.h"
 
 Inkscape::Snapper::PointType const Inkscape::Snapper::BBOX_POINT = 0x1;
 Inkscape::Snapper::PointType const Inkscape::Snapper::SNAP_POINT = 0x2;
@@ -19,12 +21,12 @@ Inkscape::Snapper::PointType const Inkscape::Snapper::SNAP_POINT = 0x2;
  *  \param nv Named view.
  *  \param d Snap distance.
  */
-Inkscape::Snapper::Snapper(SPNamedView const *nv, NR::Coord const d) : _named_view(nv), _distance(d)
+Inkscape::Snapper::Snapper(SPNamedView const *nv, NR::Coord const d) : _named_view(nv), _enabled(true), _distance(d)
 {
     g_assert(_named_view != NULL);
     g_assert(SP_IS_NAMEDVIEW(_named_view));
 
-    setSnapTo(BBOX_POINT, true);
+    setSnapTo(BBOX_POINT | SNAP_POINT, true); //Snap any point. In v0.45 and earlier, this was controlled in the preferences tab
 }
 
 /**
@@ -37,11 +39,11 @@ void Inkscape::Snapper::setDistance(NR::Coord const d)
 }
 
 /**
- *  \return Snap distance (desktop coordinates)
+ *  \return Snap distance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels
  */
 NR::Coord Inkscape::Snapper::getDistance() const
 {
-    return _distance;
+    return _distance / SP_ACTIVE_DESKTOP->current_zoom();
 }
 
 /**
@@ -68,15 +70,15 @@ bool Inkscape::Snapper::getSnapTo(PointType t) const
 }
 
 /**
- *  \return true if this Snapper will snap at least one kind of point.
+ *  \param s true to enable this snapper, otherwise false.
  */
-bool Inkscape::Snapper::willSnapSomething() const
+
+void Inkscape::Snapper::setEnabled(bool s)
 {
-    return (_snap_to != 0);
+    _enabled = s;
 }
 
 
-
 /**
  *  Try to snap a point to whatever this snapper is interested in.  Any
  *  snap that occurs will be to the nearest "interesting" thing (e.g. a
@@ -113,7 +115,7 @@ Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
                                                    NR::Point const &p,
                                                    std::list<SPItem const *> const &it) const
 {
-    if (getSnapTo(t) == false) {
+    if (_enabled == false || getSnapTo(t) == false) {
         return SnappedPoint(p, NR_HUGE);
     }
 
@@ -136,7 +138,7 @@ Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
 
 Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
                                                           NR::Point const &p,
-                                                          NR::Point const &c,
+                                                          ConstraintLine const &c,
                                                           SPItem const *it) const
 {
     std::list<SPItem const *> lit;
@@ -158,10 +160,10 @@ Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
 
 Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
                                                           NR::Point const &p,
-                                                          NR::Point const &c,
+                                                          ConstraintLine const &c,
                                                           std::list<SPItem const *> const &it) const
 {
-    if (getSnapTo(t) == false) {
+    if (_enabled == false || getSnapTo(t) == false) {
         return SnappedPoint(p, NR_HUGE);
     }