restore last used attribute table view when exiting multi-edit mode

alexbruy · nyalldawson · commit 0a6312da8276 · 2020-05-22T09:28:10.000+10:00
(fix #25099)
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -630,7 +630,12 @@ void QgsDualView::openConditionalStyles()
 void QgsDualView::setMultiEditEnabled( bool enabled )
 {
   if ( enabled )
+  {
+    mPreviousView = view();
     setView( AttributeEditor );
+  }
+  else
+    setView( mPreviousView );
 
   mAttributeForm->setMode( enabled ? QgsAttributeEditorContext::MultiEditMode : QgsAttributeEditorContext::SingleEditMode );
 }
diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
@@ -431,6 +431,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
     QgsFeature mTempAttributeFormFeature;
     QgsFeatureIds mLastFeatureSet;
     bool mBrowsingAutoPanScaleAllowed = true;
+    ViewMode mPreviousView;
 
     friend class TestQgsDualView;
     friend class TestQgsAttributeTable;

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,12 @@ void QgsDualView::openConditionalStyles()`
`630`	`630`	`void QgsDualView::setMultiEditEnabled( bool enabled )`
`631`	`631`	`{`
`632`	`632`	`if ( enabled )`
	`633`	`+ {`
	`634`	`+ mPreviousView = view();`
`633`	`635`	`setView( AttributeEditor );`
	`636`	`+ }`
	`637`	`+ else`
	`638`	`+ setView( mPreviousView );`
`634`	`639`
`635`	`640`	`mAttributeForm->setMode( enabled ? QgsAttributeEditorContext::MultiEditMode : QgsAttributeEditorContext::SingleEditMode );`
`636`	`641`	`}`