diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2011-09-17 12:08:49 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2011-09-17 12:08:49 +0000 |
| commit | f0fa8577f48a7b0ddb285764404be316855d2e83 (patch) | |
| tree | ff89b969ff17fa0a438df5233aacbc884452608b | |
| parent | Make zero deviation Gaussian blur conform to the SVG specification. (diff) | |
| download | inkscape-f0fa8577f48a7b0ddb285764404be316855d2e83.tar.gz inkscape-f0fa8577f48a7b0ddb285764404be316855d2e83.zip | |
Make "snap page border" toggle independent of "snap paths" toggle
Fixed bugs:
- https://launchpad.net/bugs/850982
(bzr r10635)
| -rw-r--r-- | src/object-snapper.cpp | 2 | ||||
| -rw-r--r-- | src/snap.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index fa992a852..c5b2b7cd7 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -324,7 +324,7 @@ void Inkscape::ObjectSnapper::_snapTranslatingGuide(IntermSnapResults &isr, // Iterate through all nodes, find out which one is the closest to this guide, and snap to it! _collectNodes(SNAPSOURCE_GUIDE, true); - if (_snapmanager->snapprefs.isTargetSnappable(SNAPTARGET_PATH, SNAPTARGET_PATH_INTERSECTION, SNAPTARGET_BBOX_EDGE, SNAPTARGET_PAGE_BORDER)) { + if (_snapmanager->snapprefs.isTargetSnappable(SNAPTARGET_PATH, SNAPTARGET_PATH_INTERSECTION, SNAPTARGET_BBOX_EDGE, SNAPTARGET_PAGE_BORDER, SNAPTARGET_TEXT_BASELINE)) { _collectPaths(p, SNAPSOURCE_GUIDE, true); _snapPaths(isr, SnapCandidatePoint(p, SNAPSOURCE_GUIDE), NULL, NULL); } diff --git a/src/snap.cpp b/src/snap.cpp index ac2abd63b..631704b5c 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -1167,11 +1167,9 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Inkscape::SnapCandidatePoint co } // search for the closest snapped curve - if (snapprefs.isTargetSnappable(Inkscape::SNAPTARGET_PATH)) { // We might have been looking for path intersections only, and not for the paths themselves - Inkscape::SnappedCurve closestCurve; - if (getClosestCurve(isr.curves, closestCurve)) { - sp_list.push_back(Inkscape::SnappedPoint(closestCurve)); - } + Inkscape::SnappedCurve closestCurve; + if (getClosestCurve(isr.curves, closestCurve)) { + sp_list.push_back(Inkscape::SnappedPoint(closestCurve)); } if (snapprefs.isTargetSnappable(Inkscape::SNAPTARGET_PATH_INTERSECTION)) { |