Vertex tool, fix escape to stop dragging edge

and make keypress handling cleaner
qgis · May 21, 2020 · f3ae6c1 · f3ae6c1
1 parent ef01c3c
commit f3ae6c1
Showing 1 changed file with 44 additions and 30 deletions.
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -1236,38 +1236,52 @@ void QgsVertexTool::updateFeatureBand( const QgsPointLocator::Match &m )
 
 void QgsVertexTool::keyPressEvent( QKeyEvent *e )
 {
-  if ( !mDraggingVertex && !mDraggingEdge && e->key() == Qt::Key_R && e->modifiers() & Qt::ShiftModifier )
+  switch ( e->key() )
   {
-    startRangeVertexSelection();
-    return;
-  }
-  if ( mSelectionMethod == SelectionRange && e->key() == Qt::Key_Escape )
-  {
-    stopRangeVertexSelection();
-    return;
-  }
-
-  if ( !mDraggingVertex && mSelectedVertices.count() == 0 )
-    return;
-
-  if ( e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace )
-  {
-    e->ignore();  // Override default shortcut management
-    deleteVertex();
-  }
-  else if ( e->key() == Qt::Key_Escape )
-  {
-    if ( mDraggingVertex )
-      stopDragging();
-  }
-  else if ( e->key() == Qt::Key_Less || e->key() == Qt::Key_Comma )
-  {
-    highlightAdjacentVertex( -1 );
-  }
-  else if ( e->key() == Qt::Key_Greater || e->key() == Qt::Key_Period )
-  {
-    highlightAdjacentVertex( + 1 );
+    case Qt::Key_Escape:
+    {
+      if ( mSelectionMethod == SelectionRange )
+        stopRangeVertexSelection();
+      if ( mDraggingVertex || mDraggingEdge )
+        stopDragging();
+      break;
+    }
+    case Qt::Key_Delete:
+    case Qt::Key_Backspace:
+    {
+      if ( mDraggingVertex || ( !mDraggingEdge && !mSelectedVertices.isEmpty() ) )
+      {
+        e->ignore();  // Override default shortcut management
+        deleteVertex();
+      }
+      break;
+    }
+    case Qt::Key_R:
+    {
+      if ( e->modifiers() & Qt::ShiftModifier && !mDraggingVertex && !mDraggingEdge )
+        startRangeVertexSelection();
+      break;
+    }
+    case Qt::Key_Less:
+    case Qt::Key_Comma:
+    {
+      if ( !mDraggingVertex && !mDraggingEdge )
+        highlightAdjacentVertex( -1 );
+      break;
+    }
+    case Qt::Key_Greater:
+    case Qt::Key_Period:
+    {
+      if ( !mDraggingVertex && !mDraggingEdge )
+        highlightAdjacentVertex( + 1 );
+      break;
+    }
+    default:
+    {
+      return;
+    }
   }
+  return;
 }
 
 QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatureId fid )