summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/node.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-09-25 09:04:23 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-09-25 09:04:23 +0000
commite97b9eafcdbf2ac0034bca19e5e9c3297d438da3 (patch)
treeffb2ed3f89b69517e4d95e5ab160dbb8a82aed88 /src/ui/tool/node.cpp
parentTranslations. POT file and French translation update. (diff)
downloadinkscape-e97b9eafcdbf2ac0034bca19e5e9c3297d438da3.tar.gz
inkscape-e97b9eafcdbf2ac0034bca19e5e9c3297d438da3.zip
fix snapmanager initialization
Fixed bugs: - https://launchpad.net/bugs/630642 (bzr r9783)
Diffstat (limited to 'src/ui/tool/node.cpp')
-rw-r--r--src/ui/tool/node.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 1070e4bc3..575a2f59e 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -944,7 +944,12 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
{
// For a note on how snapping is implemented in Inkscape, see snap.h.
SnapManager &sm = _desktop->namedview->snap_manager;
+ // even if we won't really snap, we might still call the one of the
+ // constrainedSnap() methods to enforce the constraints, so we need
+ // to setup the snapmanager anyway; this is also required for someSnapperMightSnap()
+ sm.setup(_desktop);
bool snap = sm.someSnapperMightSnap();
+
Inkscape::SnappedPoint sp;
std::vector<Inkscape::SnapCandidatePoint> unselected;
if (snap) {
@@ -966,11 +971,6 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
}
}
sm.setupIgnoreSelection(_desktop, true, &unselected);
- } else {
- // even if we won't really snap, we might still call the one of the
- // constrainedSnap() methods to enforce the constraints, so we need
- // to setup the snapmanager anyway
- sm.setup(_desktop);
}
if (held_control(*event)) {