2006-08-09 Michael Wybrow <mjwybrow@users.sourceforge.net>

[inkscape.git] / src / snap.h

diff --git a/src/snap.h b/src/snap.h
index dc2d0c7883c25d980479a20e4fffa19c87380740..c60d866ad34d0bce75a65f667c961f605b82e9c6 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
@@ -10,7 +10,7 @@
  *   Frank Felfe <innerspace@iname.com>
  *   Carl Hetherington <inkscape@carlh.net>
  *
- * Copyright (C) 2006      Johan Engelen <johan@shouraizou.nl>
+ * Copyright (C) 2006-2007 Johan Engelen <johan@shouraizou.nl>
  * Copyright (C) 2000-2002 Lauris Kaplinski
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -22,7 +22,6 @@
 #include <libnr/nr-dim2.h>
 #include <libnr/nr-forward.h>
 #include <libnr/nr-scale.h>
-#include "grid-snapper.h"
 #include "guide-snapper.h"
 #include "object-snapper.h"
 
@@ -40,8 +39,10 @@ class SnapManager
 {
 public:
     SnapManager(SPNamedView const *v);
-    
-    bool willSnapSomething() const;
+
+    typedef std::list<const Inkscape::Snapper*> SnapperList;
+
+    bool SomeSnapperMightSnap() const;
 
     Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType t,
                                     NR::Point const &p,
@@ -50,7 +51,22 @@ public:
     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,
+                                      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 );
+
     Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
                                            NR::Point const &p,
                                            Inkscape::Snapper::ConstraintLine const &c,
@@ -100,15 +116,25 @@ public:
                                             NR::Point const &o,
                                             NR::Dim2 d) const;
 
-    Inkscape::GridSnapper grid;        ///< grid snapper
-    Inkscape::AxonomGridSnapper axonomgrid;  ///< axonometricgrid snapper
     Inkscape::GuideSnapper guide;      ///< guide snapper
     Inkscape::ObjectSnapper object;    ///< snapper to other objects
 
-    typedef std::list<const Inkscape::Snapper*> SnapperList;
     SnapperList getSnappers() const;
-    SnapperList gridSnappers;          ///< List of grid snappers to enable multiple grids
-
+    SnapperList getGridSnappers() const;
+    
+    void setSnapModeBBox(bool enabled);
+    void setSnapModeNode(bool enabled);
+    bool getSnapModeBBox() const;
+    bool getSnapModeNode() const;
+
+       void setIncludeItemCenter(bool enabled) {
+               _include_item_center = enabled;
+       }
+       
+       bool getIncludeItemCenter()     const {
+               return _include_item_center;
+       }
+               
 protected:
     SPNamedView const *_named_view;
 
@@ -121,6 +147,8 @@ private:
         SKEW
     };
     
+    bool _include_item_center; //If true, snapping nodes will also snap the item's center
+    
     std::pair<NR::Point, bool> _snapTransformed(Inkscape::Snapper::PointType type,
                                                 std::vector<NR::Point> const &points,
                                                 std::list<SPItem const *> const &ignore,