fix 1767940

[inkscape.git] / src / snapper.cpp

diff --git a/src/snapper.cpp b/src/snapper.cpp
index 723213afe18643666fd611ca1994e6bb072e8f4b..7a82fe1d462f384e3be8c9ff85146c1d3f768fff 100644 (file)
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -10,21 +10,23 @@
 
 #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;
+Inkscape::Snapper::PointType const Inkscape::Snapper::SNAPPOINT_BBOX = 0x1;
+Inkscape::Snapper::PointType const Inkscape::Snapper::SNAPPOINT_NODE = 0x2;
 
 /**
  *  Construct new Snapper for named view.
  *  \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);
+    setSnapFrom(SNAPPOINT_BBOX | SNAPPOINT_NODE, 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();
 }
 
 /**
@@ -49,12 +51,12 @@ NR::Coord Inkscape::Snapper::getDistance() const
  *  \param t Point type.
  *  \param s true to snap to this point type, otherwise false;
  */
-void Inkscape::Snapper::setSnapTo(PointType t, bool s)
+void Inkscape::Snapper::setSnapFrom(PointType t, bool s)
 {
     if (s) {
-        _snap_to |= t;
+        _snap_from |= t;
     } else {
-        _snap_to &= ~t;
+        _snap_from &= ~t;
     }
 }
 
@@ -62,20 +64,11 @@ void Inkscape::Snapper::setSnapTo(PointType t, bool s)
  *  \param t Point type.
  *  \return true if snapper will snap this type of point, otherwise false.
  */
-bool Inkscape::Snapper::getSnapTo(PointType t) const
+bool Inkscape::Snapper::getSnapFrom(PointType t) const
 {
-    return (_snap_to & t);
+    return (_snap_from & 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.
  */
@@ -97,7 +90,7 @@ void Inkscape::Snapper::setEnabled(bool s)
  *  \return Snapped point.
  */
 
-Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
+Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType const &t,
                                                    NR::Point const &p,
                                                    SPItem const *it) const
 {
@@ -118,15 +111,15 @@ Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
  *  \return Snapped point.
  */
 
-Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
+Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType const &t,
                                                    NR::Point const &p,
                                                    std::list<SPItem const *> const &it) const
 {
-    if (_enabled == false || getSnapTo(t) == false) {
+    if (_enabled == false || getSnapFrom(t) == false) {
         return SnappedPoint(p, NR_HUGE);
     }
 
-    return _doFreeSnap(p, it);
+    return _doFreeSnap(t, p, it);
 }
 
 
@@ -143,7 +136,7 @@ Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
  *  \return Snapped point.
  */
 
-Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
+Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType const &t,
                                                           NR::Point const &p,
                                                           ConstraintLine const &c,
                                                           SPItem const *it) const
@@ -165,16 +158,16 @@ Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
  *  \return Snapped point.
  */
 
-Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
+Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType const &t,
                                                           NR::Point const &p,
                                                           ConstraintLine const &c,
                                                           std::list<SPItem const *> const &it) const
 {
-    if (_enabled == false || getSnapTo(t) == false) {
+    if (_enabled == false || getSnapFrom(t) == false) {
         return SnappedPoint(p, NR_HUGE);
     }
 
-    return _doConstrainedSnap(p, c, it);
+    return _doConstrainedSnap(t, p, c, it);
 }
 
 /*