diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-15 19:05:39 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-15 19:05:39 +0000 |
| commit | 672afd6dd148c167ce8f5df23e35d15f888b9473 (patch) | |
| tree | 0d47f7e475daad3eedd7d89fbc5d183598044782 /src/guide-snapper.cpp | |
| parent | Making an enable/disable flag for building with dbus (diff) | |
| parent | Fix tooltip error in the preferences (Bug #446723). (diff) | |
| download | inkscape-672afd6dd148c167ce8f5df23e35d15f888b9473.tar.gz inkscape-672afd6dd148c167ce8f5df23e35d15f888b9473.zip | |
Pulling in a more recent trunk
(bzr r8254.1.56)
Diffstat (limited to 'src/guide-snapper.cpp')
| -rw-r--r-- | src/guide-snapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp index 9121e3ee2..4f70521e0 100644 --- a/src/guide-snapper.cpp +++ b/src/guide-snapper.cpp @@ -74,16 +74,16 @@ void Inkscape::GuideSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point sc.guide_lines.push_back(dummy); } -void Inkscape::GuideSnapper::_addSnappedLinesOrigin(SnappedConstraints &sc, Geom::Point const origin, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num) const +void Inkscape::GuideSnapper::_addSnappedLinesOrigin(SnappedConstraints &sc, Geom::Point const origin, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const { - SnappedPoint dummy = SnappedPoint(origin, source, source_num, Inkscape::SNAPTARGET_GUIDE_ORIGIN, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), true); + SnappedPoint dummy = SnappedPoint(origin, source, source_num, Inkscape::SNAPTARGET_GUIDE_ORIGIN, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), constrained_snap, true); sc.points.push_back(dummy); } -void Inkscape::GuideSnapper::_addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num) const +void Inkscape::GuideSnapper::_addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const { - SnappedPoint dummy = SnappedPoint(snapped_point, source, source_num, Inkscape::SNAPTARGET_GUIDE, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), true); + SnappedPoint dummy = SnappedPoint(snapped_point, source, source_num, Inkscape::SNAPTARGET_GUIDE, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), constrained_snap, true); sc.points.push_back(dummy); } |