summaryrefslogtreecommitdiffstats
path: root/src/guide-snapper.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2009-02-25 21:32:50 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2009-02-25 21:32:50 +0000
commit2498ab08b1b1eeb6807bdfec25ef618297df15db (patch)
tree37455c50f6fdad852e8005ff1f72e2285dc6997b /src/guide-snapper.cpp
parentChanges the filters name Darken outline to Dark and glow, adds a Darken edges... (diff)
downloadinkscape-2498ab08b1b1eeb6807bdfec25ef618297df15db.tar.gz
inkscape-2498ab08b1b1eeb6807bdfec25ef618297df15db.zip
Snap guides to (intersections of) guides (closes bug #331143)
(bzr r7370)
Diffstat (limited to 'src/guide-snapper.cpp')
-rw-r--r--src/guide-snapper.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 6df066cbb..989dec16b 100644
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -46,9 +46,13 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(Geom::Poi
return s;
}
+ SPGuide const *guide_to_ignore = _snapmanager->getGuideToIgnore();
+
for (GSList const *l = _snapmanager->getNamedView()->guides; l != NULL; l = l->next) {
SPGuide const *g = SP_GUIDE(l->data);
- s.push_back(std::make_pair(g->normal_to_line, g->point_on_line));
+ if (g != guide_to_ignore) {
+ s.push_back(std::make_pair(g->normal_to_line, g->point_on_line));
+ }
}
return s;
@@ -63,7 +67,7 @@ bool Inkscape::GuideSnapper::ThisSnapperMightSnap() const
return false;
}
- return (_snap_enabled && _snapmanager->snapprefs.getSnapToGuides() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes() && _snapmanager->getNamedView()->showguides);
+ return (_snap_enabled && _snapmanager->snapprefs.getSnapToGuides() && _snapmanager->getNamedView()->showguides);
}
void Inkscape::GuideSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Point const normal_to_line, Geom::Point const point_on_line) const