UX: improved delete action

No need to be in transform mode to delete selected.
friction2d · Oct 13, 2024 · d9230af · d9230af
1 parent ac00a7c
commit d9230af
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/core/canvas.cpp b/src/core/canvas.cpp
@@ -841,10 +841,20 @@ bool Canvas::handleTransormationInputKeyEvent(const eKeyEvent &e)
 
 void Canvas::deleteAction()
 {
-    if (mCurrentMode == CanvasMode::pointTransform) {
+    switch(mCurrentMode) {
+    case CanvasMode::pointTransform:
         removeSelectedPointsAndClearList();
-    } else if (mCurrentMode == CanvasMode::boxTransform) {
+        break;
+    case CanvasMode::boxTransform:
+    case CanvasMode::circleCreate:
+    case CanvasMode::rectCreate:
+    case CanvasMode::textCreate:
+    case CanvasMode::nullCreate:
+    case CanvasMode::drawPath:
+    case CanvasMode::pathCreate:
         removeSelectedBoxesAndClearList();
+        break;
+    default:;
     }
 }
 

diff --git a/src/core/canvasselectedpointsactions.cpp b/src/core/canvasselectedpointsactions.cpp
@@ -229,8 +229,9 @@ void Canvas::removePointFromSelection(MovablePoint * const point) {
     schedulePivotUpdate();
 }
 
-void Canvas::removeSelectedPointsAndClearList() {
-    if(mPressedPoint && mPressedPoint->isCtrlPoint()) {
+void Canvas::removeSelectedPointsAndClearList()
+{
+    if (mPressedPoint && mPressedPoint->isCtrlPoint()) {
         mPressedPoint->finishTransform();
         removePointFromSelection(mPressedPoint);
         mPressedPoint->remove();
@@ -239,7 +240,12 @@ void Canvas::removeSelectedPointsAndClearList() {
     }
 
     const auto selected = mSelectedPoints_d;
-    for(const auto& point : selected) {
+    if (selected.count() < 1) {
+        removeSelectedBoxesAndClearList();
+        return;
+    }
+
+    for (const auto& point : selected) {
         point->setSelected(false);
         point->remove();
     }