Use subdirectories with icon sizes.

[inkscape.git] / src / object-snapper.h

diff --git a/src/object-snapper.h b/src/object-snapper.h
index 99c8a077ea0bac95b90cf93f3df5aa0ffdb66a33..6bde3dd391a531fd7fc75bea43b0df780e67903d 100644 (file)
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
@@ -57,7 +57,8 @@ public:
                   Inkscape::SnapCandidatePoint const &p,
                   Geom::OptRect const &bbox_to_snap,
                   SnapConstraint const &c,
-                  std::vector<SPItem const *> const *it) const;
+                  std::vector<SPItem const *> const *it,
+                  std::vector<SnapCandidatePoint> *unselected_nodes) const;
 
 private:
     //store some lists of candidates, points and paths, so we don't have to rebuild them for each point we want to snap
@@ -73,8 +74,10 @@ private:
                        Geom::Matrix const additional_affine) const;
 
     void _snapNodes(SnappedConstraints &sc,
-                      Inkscape::SnapCandidatePoint const &p,
-                      std::vector<SnapCandidatePoint> *unselected_nodes) const; // in desktop coordinates
+                      Inkscape::SnapCandidatePoint const &p, // in desktop coordinates
+                      std::vector<SnapCandidatePoint> *unselected_nodes,
+                      SnapConstraint const &c = SnapConstraint(),
+                      Geom::Point const &p_proj_on_constraint = Geom::Point()) const;
 
     void _snapTranslatingGuide(SnappedConstraints &sc,
                      Geom::Point const &p,
@@ -90,12 +93,14 @@ private:
 
     void _snapPathsConstrained(SnappedConstraints &sc,
                  Inkscape::SnapCandidatePoint const &p, // in desktop coordinates
-                 SnapConstraint const &c) const;
+                 SnapConstraint const &c,
+                 Geom::Point const &p_proj_on_constraint) const;
 
     bool isUnselectedNode(Geom::Point const &point, std::vector<Inkscape::SnapCandidatePoint> const *unselected_nodes) const;
 
-    void _collectPaths(Inkscape::SnapCandidatePoint const &p,
-                  bool const &first_point) const;
+    void _collectPaths(Geom::Point p,
+                      Inkscape::SnapSourceType const source_type,
+                      bool const &first_point) const;
 
     void _clear_paths() const;
     Geom::PathVector* _getBorderPathv() const;