[processing] Fix annoying loss of matrix parameter table values

if back button is pressed in table panel instead of "Ok" The back button was treated as "cancel", but now the "cancel" only happens if the user explicitly hits the Cancel button.
qgis · Dec 8, 2022 · 3a04bb5 · 3a04bb5
1 parent 928689d
commit 3a04bb5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/gui/processing/qgsprocessingmatrixparameterdialog.cpp b/src/gui/processing/qgsprocessingmatrixparameterdialog.cpp
@@ -43,14 +43,16 @@ QgsProcessingMatrixParameterPanelWidget::QgsProcessingMatrixParameterPanelWidget
   mButtonRemoveAll = new QPushButton( tr( "Remove All" ) );
   mButtonBox->addButton( mButtonRemoveAll, QDialogButtonBox::ActionRole );
 
-  connect( mButtonBox->button( QDialogButtonBox::Ok ), &QPushButton::clicked, this, [ = ]
+  connect( mButtonBox->button( QDialogButtonBox::Ok ), &QPushButton::clicked, this, &QgsPanelWidget::acceptPanel );
+  connect( mButtonBox->button( QDialogButtonBox::Cancel ), &QPushButton::clicked, this, [ = ]
   {
-    emit widgetChanged();
+    mWasCanceled = true;
     acceptPanel();
   } );
-  connect( mButtonBox->button( QDialogButtonBox::Cancel ), &QPushButton::clicked, this, [ = ]
+  connect( this, &QgsPanelWidget::panelAccepted, this, [ = ]()
   {
-    acceptPanel();
+    if ( !mWasCanceled )
+      emit widgetChanged();
   } );
 
   connect( mButtonAdd, &QPushButton::clicked, this, &QgsProcessingMatrixParameterPanelWidget::addRow );

diff --git a/src/gui/processing/qgsprocessingmatrixparameterdialog.h b/src/gui/processing/qgsprocessingmatrixparameterdialog.h
@@ -64,6 +64,7 @@ class GUI_EXPORT QgsProcessingMatrixParameterPanelWidget : public QgsPanelWidget
     QPushButton *mButtonRemoveAll = nullptr;
     const QgsProcessingParameterMatrix *mParam = nullptr;
     QStandardItemModel *mModel = nullptr;
+    bool mWasCanceled = false;
 
     void populateTable( const QVariantList &contents );