diff options
| author | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-08-10 22:18:26 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-08-10 22:18:26 +0000 |
| commit | 4582ff808a6776266e017cbb5df5b70c461483bc (patch) | |
| tree | a900de88ceaae1fd7fe6b24096a87c028e7223f8 /src/snap.cpp | |
| parent | Tutorials. New Indonesian advanced tutorial translation. (diff) | |
| download | inkscape-4582ff808a6776266e017cbb5df5b70c461483bc.tar.gz inkscape-4582ff808a6776266e017cbb5df5b70c461483bc.zip | |
Implement constrained snapping to nodes
(bzr r9696)
Diffstat (limited to '')
| -rw-r--r-- | src/snap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/snap.cpp b/src/snap.cpp index bcacb81e2..7ba85a9aa 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -374,7 +374,7 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::SnapCandidatePoint SnappedConstraints sc; SnapperList const snappers = getSnappers(); for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) { - (*i)->constrainedSnap(sc, p, bbox_to_snap, constraint, &_items_to_ignore); + (*i)->constrainedSnap(sc, p, bbox_to_snap, constraint, &_items_to_ignore, _unselected_nodes); } Inkscape::SnappedPoint result = findBestSnap(p, sc, true); @@ -422,7 +422,7 @@ Inkscape::SnappedPoint SnapManager::multipleConstrainedSnaps(Inkscape::SnapCandi // Try to snap to the constraint if (!snapping_is_futile) { for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) { - (*i)->constrainedSnap(sc, p, bbox_to_snap, *c, &_items_to_ignore); + (*i)->constrainedSnap(sc, p, bbox_to_snap, *c, &_items_to_ignore,_unselected_nodes); } } } @@ -526,14 +526,14 @@ void SnapManager::guideConstrainedSnap(Geom::Point &p, SPGuide const &guideline) SnappedConstraints sc; Inkscape::Snapper::SnapConstraint cl(guideline.point_on_line, Geom::rot90(guideline.normal_to_line)); if (object.ThisSnapperMightSnap()) { - object.constrainedSnap(sc, candidate, Geom::OptRect(), cl, NULL); + object.constrainedSnap(sc, candidate, Geom::OptRect(), cl, NULL, NULL); } // Snap to guides & grid lines SnapperList snappers = getGridSnappers(); snappers.push_back(&guide); for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) { - (*i)->constrainedSnap(sc, candidate, Geom::OptRect(), cl, NULL); + (*i)->constrainedSnap(sc, candidate, Geom::OptRect(), cl, NULL, NULL); } Inkscape::SnappedPoint const s = findBestSnap(candidate, sc, false); |
