From 4254ddc1b51813c1cd7c8eec31fcbcf16802b1cf Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Fri, 20 Aug 2010 22:20:02 +0200 Subject: When doing a constrained snap, then don't try snapping the mouse pointer itself but try snapping its projection (onto the constraint) instead (bzr r9719) --- src/object-snapper.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/object-snapper.h') diff --git a/src/object-snapper.h b/src/object-snapper.h index 4933d8459..6bde3dd39 100644 --- a/src/object-snapper.h +++ b/src/object-snapper.h @@ -74,9 +74,10 @@ private: Geom::Matrix const additional_affine) const; void _snapNodes(SnappedConstraints &sc, - Inkscape::SnapCandidatePoint const &p, + Inkscape::SnapCandidatePoint const &p, // in desktop coordinates std::vector *unselected_nodes, - SnapConstraint const &c = SnapConstraint()) const; // in desktop coordinates + SnapConstraint const &c = SnapConstraint(), + Geom::Point const &p_proj_on_constraint = Geom::Point()) const; void _snapTranslatingGuide(SnappedConstraints &sc, Geom::Point const &p, @@ -92,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 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; -- cgit v1.2.3