Do not auto-close vertex editor on any mouse click (ref #17243)

This is a partial fix for #17243 to improve usability of vertex editor panel. Until now the vertex editor would get closed on any mouse click in mouse canvas, making it quite annoying to work with it. With this change, the vertex editor stays open until is is explicitly closed.
qgis · Feb 23, 2018 · 917c7b6 · 917c7b6
1 parent 131efbd
commit 917c7b6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -387,6 +387,13 @@ void QgsVertexEditor::keyPressEvent( QKeyEvent *e )
   }
 }
 
+void QgsVertexEditor::closeEvent( QCloseEvent *event )
+{
+  QgsDockWidget::closeEvent( event );
+
+  emit editorClosed();
+}
+
 //
 // CoordinateItemDelegate
 //

diff --git a/src/app/vertextool/qgsvertexeditor.h b/src/app/vertextool/qgsvertexeditor.h
@@ -83,9 +83,11 @@ class QgsVertexEditor : public QgsDockWidget
 
   signals:
     void deleteSelectedRequested();
+    void editorClosed();
 
   protected:
     void keyPressEvent( QKeyEvent *event ) override;
+    void closeEvent( QCloseEvent *event ) override;
 
   private slots:
     void updateTableSelection();

diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -374,8 +374,6 @@ void QgsVertexTool::cadCanvasPressEvent( QgsMapMouseEvent *e )
     return;
   }
 
-  cleanupVertexEditor();
-
   if ( !mDraggingVertex && !mSelectedVertices.isEmpty() && !( e->modifiers() & Qt::ShiftModifier ) && !( e->modifiers() & Qt::ControlModifier ) )
   {
     // only remove highlight if not clicked on one of highlighted vertices
@@ -1041,6 +1039,7 @@ void QgsVertexTool::showVertexEditor()  //#spellok
   mVertexEditor.reset( new QgsVertexEditor( m.layer(), mSelectedFeature.get(), mCanvas ) );
   QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mVertexEditor.get() );
   connect( mVertexEditor.get(), &QgsVertexEditor::deleteSelectedRequested, this, &QgsVertexTool::deleteVertexEditorSelection );
+  connect( mVertexEditor.get(), &QgsVertexEditor::editorClosed, this, &QgsVertexTool::cleanupVertexEditor );
   connect( mSelectedFeature.get()->vlayer(), &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::cleanEditor );
 }
 

diff --git a/src/app/vertextool/qgsvertextool.h b/src/app/vertextool/qgsvertextool.h
@@ -119,6 +119,8 @@ class APP_EXPORT QgsVertexTool : public QgsMapToolAdvancedDigitizing
 
     void removeTemporaryRubberBands();
 
+    void cleanupVertexEditor();
+
     /**
      * Temporarily override snapping config and snap to vertices and edges
      of any editable vector layer, to allow selection of vertex for editing
@@ -202,8 +204,6 @@ class APP_EXPORT QgsVertexTool : public QgsMapToolAdvancedDigitizing
      */
     bool matchEdgeCenterTest( const QgsPointLocator::Match &m, const QgsPointXY &mapPoint, QgsPointXY *edgeCenterPtr = nullptr );
 
-    void cleanupVertexEditor();
-
     //! Run validation on a geometry (in a background thread)
     void validateGeometry( QgsVectorLayer *layer, QgsFeatureId featureId );