summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/multi-path-manipulator.cpp
diff options
context:
space:
mode:
authorVinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>2014-05-08 00:59:39 +0000
committerVinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>2014-05-08 00:59:39 +0000
commit267adec8dfa7797915cff84b463fef5f9570a6e4 (patch)
tree2580dea1021dff4f4cf56f750c978fe251de0868 /src/ui/tool/multi-path-manipulator.cpp
parentDocumentation. Advanced tutorial update (not fully translated). (diff)
parentadding const _pathmanipulatos staff to handles (handles also have tips) (diff)
downloadinkscape-267adec8dfa7797915cff84b463fef5f9570a6e4.tar.gz
inkscape-267adec8dfa7797915cff84b463fef5f9570a6e4.zip
Merging Jabier's spirolive+bspline branch
(bzr r13341.2.1)
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 65987ad52..68aaa77a5 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));