Save dialog geometry on attribute form reject

qgis · May 21, 2014 · 2e8ba8b · 2e8ba8b
1 parent 885a303
commit 2e8ba8b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -444,7 +444,7 @@ void QgsAttributeDialog::init()
         buttonBox->setStandardButtons( QDialogButtonBox::Cancel );
       }
 
-      connect( buttonBox, SIGNAL( rejected() ), mDialog, SLOT( reject() ) );
+      connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
     }
   }
   else
@@ -557,6 +557,16 @@ QgsAttributeDialog::~QgsAttributeDialog()
   }
 }
 
+void QgsAttributeDialog::reject()
+{
+  // Only save the geometry of the dialog if it's not a custom one.
+  if ( mLayer->editorLayout() != QgsVectorLayer::UiFileLayout )
+  {
+    saveGeometry();
+  }
+  mDialog->reject();
+}
+
 void QgsAttributeDialog::accept()
 {
   if ( !mLayer->isEditable() || !mFeature )

diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -88,6 +88,7 @@ class GUI_EXPORT QgsAttributeDialog : public QObject
     bool editable() { return mEditable; }
 
   public slots:
+    void reject();
     void accept();
 
     int exec();