summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/node.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-03-17 23:55:48 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-03-17 23:55:48 +0000
commit498ff23f3dc4e32fa54b5c48fb347e9b8e738552 (patch)
tree83cb05fc1d0c753d54800269289e7193ce66c1ec /src/ui/tool/node.cpp
parentwebslicer: now a slicer rectangle remember it's configuration (diff)
downloadinkscape-498ff23f3dc4e32fa54b5c48fb347e9b8e738552.tar.gz
inkscape-498ff23f3dc4e32fa54b5c48fb347e9b8e738552.zip
Fix Ctrl-drag in node tool with zero snap delay.
Fixed bugs: - https://launchpad.net/bugs/539995 (bzr r9200)
Diffstat (limited to 'src/ui/tool/node.cpp')
-rw-r--r--src/ui/tool/node.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index ebf30cc77..c82b0c7d6 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -1006,11 +1006,11 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
// TODO: combine the snap and non-snap branches by modifying snap.h / snap.cpp
if (snap) {
if (line_front) {
- fp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(position(),
+ fp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos,
_snapSourceType()), *line_front);
}
if (line_back) {
- bp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(position(),
+ bp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos,
_snapSourceType()), *line_back);
}
}
@@ -1042,8 +1042,8 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
if (snap) {
Inkscape::Snapper::ConstraintLine line_x(origin, Geom::Point(1, 0));
Inkscape::Snapper::ConstraintLine line_y(origin, Geom::Point(0, 1));
- fp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(position(), _snapSourceType()), line_x);
- bp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(position(), _snapSourceType()), line_y);
+ fp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), line_x);
+ bp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), line_y);
}
if (fp.getSnapped() || bp.getSnapped()) {
if (fp.isOtherSnapBetter(bp, false)) {