summaryrefslogtreecommitdiffstats
path: root/src/snap.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2011-08-25 20:08:16 +0000
committerDiederik van Lierop <mail@diedenrezi.nl>2011-08-25 20:08:16 +0000
commit3da0fd8b645937bcdd26d2ab3db716982030fc19 (patch)
tree7a179f4738231b660719a116a5f0ce0dcc2ba178 /src/snap.cpp
parentExtensions. Missing files for Text>Extract... (diff)
downloadinkscape-3da0fd8b645937bcdd26d2ab3db716982030fc19.tar.gz
inkscape-3da0fd8b645937bcdd26d2ab3db716982030fc19.zip
Fix "snap guides" toggle
Fixed bugs: - https://launchpad.net/bugs/814457 (bzr r10582)
Diffstat (limited to 'src/snap.cpp')
-rw-r--r--src/snap.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/snap.cpp b/src/snap.cpp
index c4ca32364..7647341fe 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -1413,9 +1413,10 @@ void SnapManager::_displaySnapsource(Inkscape::SnapCandidatePoint const &p) cons
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
if (prefs->getBool("/options/snapclosestonly/value")) {
- bool p_is_a_node = p.getSourceType() & Inkscape::SNAPSOURCE_NODE_CATEGORY;
- bool p_is_a_bbox = p.getSourceType() & Inkscape::SNAPSOURCE_BBOX_CATEGORY;
- bool p_is_other = p.getSourceType() & Inkscape::SNAPSOURCE_OTHERS_CATEGORY;
+ Inkscape::SnapSourceType t = p.getSourceType();
+ bool p_is_a_node = t & Inkscape::SNAPSOURCE_NODE_CATEGORY;
+ bool p_is_a_bbox = t & Inkscape::SNAPSOURCE_BBOX_CATEGORY;
+ bool p_is_other = t & Inkscape::SNAPSOURCE_OTHERS_CATEGORY || t & Inkscape::SNAPSOURCE_DATUMS_CATEGORY;
g_assert(_desktop != NULL);
if (snapprefs.getSnapEnabledGlobally() && (p_is_other || (p_is_a_node && snapprefs.getSnapModeNode()) || (p_is_a_bbox && snapprefs.getSnapModeBBox()))) {