Merge pull request #57700 from qgis/backport-57686-to-queued_ltr_back…

…ports [Backport queued_ltr_backports] Fix add feature dialog does not restore position when shown modally
qgis · Jun 7, 2024 · dd86858 · dd86858
2 parents d5542e1 + 7d307f7
commit dd86858
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/python/PyQt6/gui/auto_generated/qgsattributedialog.sip.in b/python/PyQt6/gui/auto_generated/qgsattributedialog.sip.in
@@ -75,6 +75,9 @@ Intercept window activate/deactivate events to show/hide the highlighted feature
 :return: The same as the parent QDialog
 %End
 
+    virtual void showEvent( QShowEvent *event );
+
+
     void setExtraContextScope( QgsExpressionContextScope *extraScope /Transfer/ );
 %Docstring
 Sets ``extraScope`` as an additional expression context scope to be used

diff --git a/python/gui/auto_generated/qgsattributedialog.sip.in b/python/gui/auto_generated/qgsattributedialog.sip.in
@@ -75,6 +75,9 @@ Intercept window activate/deactivate events to show/hide the highlighted feature
 :return: The same as the parent QDialog
 %End
 
+    virtual void showEvent( QShowEvent *event );
+
+
     void setExtraContextScope( QgsExpressionContextScope *extraScope /Transfer/ );
 %Docstring
 Sets ``extraScope`` as an additional expression context scope to be used

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -88,15 +88,20 @@ void QgsAttributeDialog::show()
 {
   QDialog::show();
 
+  raise();
+  activateWindow();
+}
+
+void QgsAttributeDialog::showEvent( QShowEvent *event )
+{
+  QDialog::showEvent( event );
   // We cannot call restoreGeometry() in the constructor or init because the dialog is not yet visible
   // and the geometry restoration will not take the window decorations (frame) into account.
   if ( mFirstShow )
   {
     mFirstShow = false;
     restoreGeometry();
   }
-  raise();
-  activateWindow();
 }
 
 void QgsAttributeDialog::reject()

diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -96,6 +96,8 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog, public QgsMapLayerActionCo
      */
     bool event( QEvent *e ) override;
 
+    void showEvent( QShowEvent *event ) override;
+
     /**
      * Sets \a extraScope as an additional expression context scope to be used
      * for calculations in this form.