From ba5a49daeda8a7479226be6f01a1a94de849e7c4 Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Fri, 24 Apr 2009 20:31:23 +0000 Subject: Two minor snapping fixes (bzr r7770) --- src/object-snapper.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 778928ae7..70377cb66 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -712,9 +712,15 @@ bool Inkscape::ObjectSnapper::ThisSnapperMightSnap() const return (_snap_enabled && _snapmanager->snapprefs.getSnapModeBBoxOrNodes() && snap_to_something); } -bool Inkscape::ObjectSnapper::GuidesMightSnap() const +bool Inkscape::ObjectSnapper::GuidesMightSnap() const // almost the same as ThisSnapperMightSnap above, but only looking at points (and not paths) { - bool snap_to_something = _snapmanager->snapprefs.getSnapToItemNode() || _snapmanager->snapprefs.getSnapToBBoxNode(); + bool snap_to_something = _snapmanager->snapprefs.getSnapToItemNode() + || _snapmanager->snapprefs.getSnapToPageBorder() + || (_snapmanager->snapprefs.getSnapModeBBox() && _snapmanager->snapprefs.getSnapToBBoxNode()) + || (_snapmanager->snapprefs.getSnapModeBBox() && (_snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && (_snapmanager->snapprefs.getSnapLineMidpoints() || _snapmanager->snapprefs.getSnapObjectMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && _snapmanager->snapprefs.getIncludeItemCenter()); + return (_snap_enabled && _snapmanager->snapprefs.getSnapModeGuide() && snap_to_something); } -- cgit v1.2.3