diff --git a/src/snap.h b/src/snap.h
index 2f8e83b1364e28265e882ccdc56d5fa09dfb2bdf..e0217948fe3cfdb4b0f7a96b2841096512dd49c1 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
#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"
{
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,
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,
NR::Point const &o,
NR::Dim2 d) const;
- Inkscape::GridSnapper grid; ///< grid snapper
Inkscape::GuideSnapper guide; ///< guide snapper
Inkscape::ObjectSnapper object; ///< snapper to other objects
- typedef std::list<const Inkscape::Snapper*> SnapperList;
SnapperList getSnappers() const;
+ SnapperList getGridSnappers() const;
protected:
SPNamedView const *_named_view;