Display CMS adjustment per-desktop view

[inkscape.git] / src / snap.h

diff --git a/src/snap.h b/src/snap.h
index 276069fe672b145c9b42ccc720693aa866f7021a..9547064a9663e931a48e1a92b1e982b5f4a3329b 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
@@ -22,6 +22,7 @@
 #include <libnr/nr-dim2.h>
 #include <libnr/nr-forward.h>
 #include <libnr/nr-scale.h>
+
 #include "guide-snapper.h"
 #include "object-snapper.h"
 
@@ -48,24 +49,11 @@ public:
                                     NR::Point const &p,
                                     SPItem const *it) const;
 
-    Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType t,
-                                    NR::Point const &p,
-                                    std::list<SPItem const *> const &it) const;
-
-       Inkscape::SnappedPoint freeSnap( Inkscape::Snapper::PointType t,
+    Inkscape::SnappedPoint freeSnap( Inkscape::Snapper::PointType t,
                                       NR::Point const &p,
-                                      std::list<SPItem const *> const &it,
-                                      SnapperList const &snappers ) const;
-
-    Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
-                                           NR::Point const &p,
-                                           SPItem const *it,
-                                           SnapperList &snappers );
-
-    Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
-                                           NR::Point const &p,
-                                           std::list<SPItem const *> const &it,
-                                           SnapperList &snappers );
+                                      bool const &first_point,
+                                      std::vector<NR::Point> &points_to_snap,
+                                      std::list<SPItem const *> const &it) const;
 
     Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
                                            NR::Point const &p,
@@ -74,11 +62,13 @@ public:
     
     Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
                                            NR::Point const &p,
+                                           bool const &first_point,
+                                           std::vector<NR::Point> &points_to_snap,
                                            Inkscape::Snapper::ConstraintLine const &c,
                                            std::list<SPItem const *> const &it) const;
                                            
-       Inkscape::SnappedPoint guideSnap(NR::Point const &p,
-                                                                        SPGuide const &guide) const;
+    Inkscape::SnappedPoint guideSnap(NR::Point const &p,
+                                     NR::Point const &guide_normal) const;
 
     std::pair<NR::Point, bool> freeSnapTranslation(Inkscape::Snapper::PointType t,
                                                    std::vector<NR::Point> const &p,
@@ -118,6 +108,10 @@ public:
                                             NR::Coord const &s,
                                             NR::Point const &o,
                                             NR::Dim2 d) const;
+                                            
+       Inkscape::SnappedPoint guideSnap(NR::Point const &p,
+                           Inkscape::ObjectSnapper::DimensionToSnap const snap_dim) const;
+  
 
     Inkscape::GuideSnapper guide;      ///< guide snapper
     Inkscape::ObjectSnapper object;    ///< snapper to other objects
@@ -131,17 +125,22 @@ public:
     bool getSnapModeBBox() const;
     bool getSnapModeNode() const;
     bool getSnapModeGuide() const;
-
-       void setIncludeItemCenter(bool enabled) {
-               _include_item_center = enabled;
-               object.setIncludeItemCenter(enabled);   //store a local copy in the object-snapper
-                                                                                               //instead of passing it through many functions 
-       }
-       
-       bool getIncludeItemCenter()     const {
-               return _include_item_center;
+    
+    void setSnapIntersectionGG(bool enabled) {_intersectionGG = enabled;}
+    void setSnapIntersectionLS(bool enabled) {_intersectionLS = enabled;}
+    bool getSnapIntersectionGG() { return _intersectionGG;}
+    bool getSnapIntersectionLS() { return _intersectionLS;}    
+
+    void setIncludeItemCenter(bool enabled)    {
+        _include_item_center = enabled;
+        // also store a local copy in the object-snapper instead of passing it through many functions
+        object.setIncludeItemCenter(enabled);
        }
-               
+    
+    bool getIncludeItemCenter() const {
+        return _include_item_center;
+    }
+        
 protected:
     SPNamedView const *_named_view;
 
@@ -155,6 +154,8 @@ private:
     };
     
     bool _include_item_center; //If true, snapping nodes will also snap the item's center
+    bool _intersectionGG;
+    bool _intersectionLS;
     
     std::pair<NR::Point, bool> _snapTransformed(Inkscape::Snapper::PointType type,
                                                 std::vector<NR::Point> const &points,
@@ -166,6 +167,8 @@ private:
                                                 NR::Point const &origin,
                                                 NR::Dim2 dim,
                                                 bool uniform) const;
+                                                
+    Inkscape::SnappedPoint findBestSnap(NR::Point const &p, SnappedConstraints &sc) const;
 };
 
 #endif /* !SEEN_SNAP_H */