[attribute table] Fix several issues with form view's feature navigation

- Disable zoom / pan when filtering by visible features (fixes #30763) - Disable flash / zoom / pan when not set to form view - Do not trigger flash / zoom / pan when selection hasn't actually changed
qgis · Jul 19, 2019 · cb6ef05 · cb6ef05
1 parent b1e5eb0
commit cb6ef05
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -447,24 +447,27 @@ void QgsDualView::updateEditSelectionProgress( int progress, int count )
 void QgsDualView::panOrZoomToFeature( const QgsFeatureIds &featureset )
 {
   QgsMapCanvas *canvas = mFilterModel->mapCanvas();
-  if ( canvas )
+  if ( canvas && view() == AttributeEditor && featureset != mLastFeatureSet )
   {
-    if ( mAutoPanButton->isChecked() )
-      QTimer::singleShot( 0, this, [ = ]()
-    {
-      canvas->panToFeatureIds( mLayer, featureset, false );
-    } );
-    else if ( mAutoZoomButton->isChecked() )
-      QTimer::singleShot( 0, this, [ = ]()
+    if ( filterMode() != QgsAttributeTableFilterModel::ShowVisible )
     {
-      canvas->zoomToFeatureIds( mLayer, featureset );
-    } );
-
+      if ( mAutoPanButton->isChecked() )
+        QTimer::singleShot( 0, this, [ = ]()
+      {
+        canvas->panToFeatureIds( mLayer, featureset, false );
+      } );
+      else if ( mAutoZoomButton->isChecked() )
+        QTimer::singleShot( 0, this, [ = ]()
+      {
+        canvas->zoomToFeatureIds( mLayer, featureset );
+      } );
+    }
     if ( mFlashButton->isChecked() )
       QTimer::singleShot( 0, this, [ = ]()
     {
       canvas->flashFeatureIds( mLayer, featureset );
     } );
+    mLastFeatureSet = featureset;
   }
 }
 

diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
@@ -406,6 +406,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
     // If the current feature is set, while the form is still not initialized
     // we will temporarily save it in here and set it on init
     QgsFeature mTempAttributeFormFeature;
+    QgsFeatureIds mLastFeatureSet;
 
     friend class TestQgsDualView;
     friend class TestQgsAttributeTable;