summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/multi-path-manipulator.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-05-09 00:26:27 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-05-09 00:26:27 +0000
commit3d1cf059b042d213642e74cef82ec372e79281e4 (patch)
tree8a5d0f69c4c7372e87bd2a88bffc405e0a02258f /src/ui/tool/multi-path-manipulator.cpp
parentUpdate to trunk (diff)
parentMerging Jabier's spirolive+bspline branch (diff)
downloadinkscape-3d1cf059b042d213642e74cef82ec372e79281e4.tar.gz
inkscape-3d1cf059b042d213642e74cef82ec372e79281e4.zip
Update to trunk/integrate BSpline
(bzr r13090.1.73)
Diffstat (limited to 'src/ui/tool/multi-path-manipulator.cpp')
-rw-r--r--src/ui/tool/multi-path-manipulator.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index b54b5ad07..bdcd70e00 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -670,7 +670,18 @@ bool MultiPathManipulator::event(Inkscape::UI::Tools::ToolBase *event_context, G
// a) del preserves shape, and control is not pressed
// b) ctrl+del preserves shape (del_preserves_shape is false), and control is pressed
// Hence xor
- deleteNodes(del_preserves_shape ^ held_control(event->key));
+ guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
+
+ //if the trace is bspline ( mode 2)
+ if(mode==2){
+ // is this correct ?
+ if(del_preserves_shape ^ held_control(event->key))
+ deleteNodes(false);
+ else
+ deleteNodes(true);
+ }
+ else
+ deleteNodes(del_preserves_shape ^ held_control(event->key));
// Delete any selected gradient nodes as well
event_context->deleteSelectedDrag(held_control(event->key));