diff --git a/src/object-snapper.h b/src/object-snapper.h
index 454a18545d54e2ea06b5d00947514057700760fe..6bde3dd391a531fd7fc75bea43b0df780e67903d 100644 (file)
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
ObjectSnapper(SnapManager *sm, Geom::Coord const d);
~ObjectSnapper();
- enum DimensionToSnap {
- GUIDE_TRANSL_SNAP_X, // For snapping a vertical guide (normal in the X-direction) to objects,
- GUIDE_TRANSL_SNAP_Y, // For snapping a horizontal guide (normal in the Y-direction) to objects
- ANGLED_GUIDE_TRANSL_SNAP, // For snapping an angled guide, while translating it accross the desktop
- TRANSL_SNAP_XY}; // All other cases; for snapping to objects, other than guides
-
void guideFreeSnap(SnappedConstraints &sc,
Geom::Point const &p,
Geom::Point const &guide_normal) const;
SnapConstraint const &c) const;
bool ThisSnapperMightSnap() const;
- bool GuidesMightSnap() const;
Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance
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
std::vector<SPItem const *> const *it,
bool const &first_point,
Geom::Rect const &bbox_to_snap,
- DimensionToSnap snap_dim,
bool const _clip_or_mask,
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 _snapTranslatingGuideToNodes(SnappedConstraints &sc,
+ void _snapTranslatingGuide(SnappedConstraints &sc,
Geom::Point const &p,
Geom::Point const &guide_normal) const;
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;