summaryrefslogtreecommitdiffstats
path: root/src/snap.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-07-25 20:29:45 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-07-25 20:29:45 +0000
commitb3725365a24e922e5bda09d7489c2ed17d94108f (patch)
tree59907c619c5f06bf502106aa8544e925eb0491e0 /src/snap.cpp
parentMake icon preview seleciton stikcy by default. (diff)
downloadinkscape-b3725365a24e922e5bda09d7489c2ed17d94108f.tar.gz
inkscape-b3725365a24e922e5bda09d7489c2ed17d94108f.zip
1) Snap to transformation center even if it's outside of the bounding box of the parent item
2) In some cases the snap source indicator wasn't shown (bzr r9648)
Diffstat (limited to 'src/snap.cpp')
-rw-r--r--src/snap.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/snap.cpp b/src/snap.cpp
index fc8837c43..bac37737f 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -763,6 +763,8 @@ Inkscape::SnappedPoint SnapManager::freeSnapTranslate(std::vector<Inkscape::Snap
_displaySnapsource(Inkscape::SnapCandidatePoint(pt, p.at(0).getSourceType()));
}
+
+
return _snapTransformed(p, pointer, false, Geom::Point(0,0), TRANSLATE, tr, Geom::Point(0,0), Geom::X, false);
}
@@ -1209,8 +1211,9 @@ void SnapManager::_displaySnapsource(Inkscape::SnapCandidatePoint const &p) cons
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_OTHER_CATEGORY;
- if (snapprefs.getSnapEnabledGlobally() && ((p_is_a_node && snapprefs.getSnapModeNode()) || (p_is_a_bbox && snapprefs.getSnapModeBBox()))) {
+ if (snapprefs.getSnapEnabledGlobally() && (p_is_other || (p_is_a_node && snapprefs.getSnapModeNode()) || (p_is_a_bbox && snapprefs.getSnapModeBBox()))) {
_desktop->snapindicator->set_new_snapsource(p);
} else {
_desktop->snapindicator->remove_snapsource();