Filter effects dialog:

[inkscape.git] / src / snapper.cpp

diff --git a/src/snapper.cpp b/src/snapper.cpp
index 723213afe18643666fd611ca1994e6bb072e8f4b..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), _enabled(true)
+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();
 }
 
 /**
@@ -67,15 +69,6 @@ bool Inkscape::Snapper::getSnapTo(PointType t) const
     return (_snap_to & t);
 }
 
-/**
- *  \return true if this Snapper will snap at least one kind of point.
- */
-bool Inkscape::Snapper::willSnapSomething() const
-{
-    return (_enabled && _snap_to != 0);
-}
-
-
 /**
  *  \param s true to enable this snapper, otherwise false.
  */