Fix Ctrl+Alt+click deletion of selected nodes when transform handles

are turned on.

(bzr r9008)

2 files changed, 10 insertions, 7 deletions

diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index d1ff5f9d8..615968fef 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -339,8 +339,7 @@ bool ControlPointSelection::_pointClicked(SelectableControlPoint *p, GdkEventBut
 {
     // clicking a selected node should toggle the transform handles between rotate and scale mode,
     // if they are visible
-    if (held_shift(*event)) return false;
-    if (_handles_visible && p->selected()) {
+    if (held_no_modifiers(*event) && _handles_visible && p->selected()) {
         toggleTransformHandlesMode();
         return true;
     }
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 57ae776e3..0e0276173 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -169,17 +169,21 @@ Glib::ustring CurveDragPoint::_getTip(unsigned state)
     if (!first || !first.next()) return "";
     bool linear = first->front()->isDegenerate() && first.next()->back()->isDegenerate();
     if (state_held_shift(state)) {
-        return C_("Path segment statusbar tip",
+        return C_("Path segment tip",
             "<b>Shift:</b> click to toggle segment selection");
     }
+    if (state_held_control(state) && state_held_alt(state)) {
+        return C_("Path segment tip",
+            "<b>Ctrl+Alt:</b> click to insert a node");
+    }
     if (linear) {
-        return C_("Path segment statusbar tip",
+        return C_("Path segment tip",
             "<b>Linear segment:</b> drag to convert to a Bezier segment, "
-            "doubleclick to insert node, click to select this segment");
+            "doubleclick to insert node, click to select");
     } else {
-        return C_("Path segment statusbar tip",
+        return C_("Path segment tip",
             "<b>Bezier segment:</b> drag to shape the segment, doubleclick to insert node, "
-            "click to select this segment");
+            "click to select");
     }
 }