The snap indicator's tooltip now displays "A to B", whereas before it only displayed "B".

(bzr r7335)

1 files changed, 31 insertions, 26 deletions

diff --git a/src/snap.h b/src/snap.h
index b86ceb8b0..b6ec3a5d7 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -56,64 +56,69 @@ public:
     bool someSnapperMightSnap() const;
     bool gridSnapperMightSnap() const;
 
-    void setup(SPDesktop const *desktop, bool snapindicator = true, SPItem const *item_to_ignore = NULL, std::vector<Geom::Point> *unselected_nodes = NULL);
-    void setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes = NULL);
+    void setup(SPDesktop const *desktop, bool snapindicator = true, SPItem const *item_to_ignore = NULL, std::vector<std::pair<Geom::Point, int> > *unselected_nodes = NULL);
+    void setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<std::pair<Geom::Point, int> > *unselected_nodes = NULL);
 
     // freeSnapReturnByRef() is preferred over freeSnap(), because it only returns a
-    // point if snapping has occured (by overwriting p); otherwise p is untouched
+    // point if snapping has occurred (by overwriting p); otherwise p is untouched
     void freeSnapReturnByRef(Inkscape::SnapPreferences::PointType point_type,
-                      Geom::Point &p,
-                      bool first_point = true,
-                      Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+    							Geom::Point &p,
+    							Inkscape::SnapSourceType const source_type,
+    							bool first_point = true,
+    							Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+
 
     Inkscape::SnappedPoint freeSnap(Inkscape::SnapPreferences::PointType point_type,
-                                    Geom::Point const &p,
-                                    bool first_point = true,
+									Geom::Point const &p,
+    							    Inkscape::SnapSourceType const &source_type,
+    		                        bool first_point = true,
                                     Geom::OptRect const &bbox_to_snap = Geom::OptRect() ) const;
 
     Geom::Point multipleOfGridPitch(Geom::Point const &t) const;
 
     // constrainedSnapReturnByRef() is preferred over constrainedSnap(), because it only returns a
-    // point, by overwriting p, if snapping has occured; otherwise p is untouched
+    // point, by overwriting p, if snapping has occurred; otherwise p is untouched
     void constrainedSnapReturnByRef(Inkscape::SnapPreferences::PointType point_type,
-                             Geom::Point &p,
-                             Inkscape::Snapper::ConstraintLine const &constraint,
-                             bool first_point = true,
-                             Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+									Geom::Point &p,
+									Inkscape::SnapSourceType const source_type,
+									Inkscape::Snapper::ConstraintLine const &constraint,
+									bool first_point = true,
+									Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
 
     Inkscape::SnappedPoint constrainedSnap(Inkscape::SnapPreferences::PointType point_type,
-                                           Geom::Point const &p,
-                                           Inkscape::Snapper::ConstraintLine const &constraint,
+										   Geom::Point const &p,
+										   Inkscape::SnapSourceType const &source_type,
+										   Inkscape::Snapper::ConstraintLine const &constraint,
                                            bool first_point = true,
                                            Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
 
     void guideSnap(Geom::Point &p, Geom::Point const &guide_normal) const;
 
     Inkscape::SnappedPoint freeSnapTranslation(Inkscape::SnapPreferences::PointType point_type,
-                                               std::vector<Geom::Point> const &p,
+                                               std::vector<std::pair<Geom::Point, int> > const &p,
                                                Geom::Point const &pointer,
                                                Geom::Point const &tr) const;
 
     Inkscape::SnappedPoint constrainedSnapTranslation(Inkscape::SnapPreferences::PointType point_type,
-                                                      std::vector<Geom::Point> const &p,
+                                                      std::vector<std::pair<Geom::Point, int> > const &p,
                                                       Geom::Point const &pointer,
                                                       Inkscape::Snapper::ConstraintLine const &constraint,
                                                       Geom::Point const &tr) const;
 
     Inkscape::SnappedPoint freeSnapScale(Inkscape::SnapPreferences::PointType point_type,
-                                         std::vector<Geom::Point> const &p,
+                                         std::vector<std::pair<Geom::Point, int> > const &p,
                                          Geom::Point const &pointer,
                                          Geom::Scale const &s,
                                          Geom::Point const &o) const;
 
     Inkscape::SnappedPoint constrainedSnapScale(Inkscape::SnapPreferences::PointType point_type,
-                                                std::vector<Geom::Point> const &p,
+                                                std::vector<std::pair<Geom::Point, int> > const &p,
                                                 Geom::Point const &pointer,
                                                 Geom::Scale const &s,
                                                 Geom::Point const &o) const;
 
     Inkscape::SnappedPoint constrainedSnapStretch(Inkscape::SnapPreferences::PointType point_type,
-                                                  std::vector<Geom::Point> const &p,
+                                                  std::vector<std::pair<Geom::Point, int> > const &p,
                                                   Geom::Point const &pointer,
                                                   Geom::Coord const &s,
                                                   Geom::Point const &o,
@@ -121,7 +126,7 @@ public:
                                                   bool uniform) const;
 
     Inkscape::SnappedPoint constrainedSnapSkew(Inkscape::SnapPreferences::PointType point_type,
-                                               std::vector<Geom::Point> const &p,
+                                               std::vector<std::pair<Geom::Point, int> > const &p,
                                                Geom::Point const &pointer,
                                                Inkscape::Snapper::ConstraintLine const &constraint,
                                                Geom::Point const &s, // s[0] = skew factor, s[1] = scale factor
@@ -149,10 +154,10 @@ private:
     SPItem const *_item_to_ignore;
     SPDesktop const *_desktop;
     bool _snapindicator;
-    std::vector<Geom::Point> *_unselected_nodes;
+    std::vector<std::pair<Geom::Point, int> > *_unselected_nodes;
 
     Inkscape::SnappedPoint _snapTransformed(Inkscape::SnapPreferences::PointType type,
-                                            std::vector<Geom::Point> const &points,
+                                            std::vector<std::pair<Geom::Point, int> > const &points,
                                             Geom::Point const &pointer,
                                             bool constrained,
                                             Inkscape::Snapper::ConstraintLine const &constraint,
@@ -162,16 +167,16 @@ private:
                                             Geom::Dim2 dim,
                                             bool uniform) const;
 
-    Geom::Point _transformPoint(Geom::Point const &p,
+    Geom::Point _transformPoint(std::pair<Geom::Point, int> const &p,
                                             Transformation const transformation_type,
                                             Geom::Point const &transformation,
                                             Geom::Point const &origin,
                                             Geom::Dim2 const dim,
                                             bool const uniform) const;
 
-    void _displaySnapsource(Inkscape::SnapPreferences::PointType point_type, Geom::Point const &p) const;
+    void _displaySnapsource(Inkscape::SnapPreferences::PointType point_type, std::pair<Geom::Point, int> const &p) const;
 
-    Inkscape::SnappedPoint findBestSnap(Geom::Point const &p, SnappedConstraints &sc, bool constrained) const;
+    Inkscape::SnappedPoint findBestSnap(Geom::Point const &p, Inkscape::SnapSourceType const source_type, SnappedConstraints &sc, bool constrained) const;
 };
 
 #endif /* !SEEN_SNAP_H */