Merge pull request #52472 from YoannQDQ/fix-walking-attribute-dialog

m-kuhn · web-flow · commit 2175537f327f · 2023-04-24T14:00:06.000+02:00
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -87,6 +87,14 @@ void QgsAttributeDialog::accept()
 void QgsAttributeDialog::show()
 {
   QDialog::show();
+
+  // 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();
 }
@@ -133,8 +141,6 @@ void QgsAttributeDialog::init( QgsVectorLayer *layer, QgsFeature *feature, const
     mMenuBar->addMenu( mMenu );
     layout()->setMenuBar( mMenuBar );
   }
-
-  restoreGeometry();
   focusNextChild();
 }
 
diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -136,6 +136,7 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog, public QgsMapLayerActionCo
 
     static int sFormCounter;
 
+    bool mFirstShow = true;
     void saveGeometry();
     void restoreGeometry();
 };

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,14 @@ void QgsAttributeDialog::accept()`
`87`	`87`	`void QgsAttributeDialog::show()`
`88`	`88`	`{`
`89`	`89`	`QDialog::show();`
	`90`	`+`
	`91`	`+ // We cannot call restoreGeometry() in the constructor or init because the dialog is not yet visible`
	`92`	`+ // and the geometry restoration will not take the window decorations (frame) into account.`
	`93`	`+ if ( mFirstShow )`
	`94`	`+ {`
	`95`	`+ mFirstShow = false;`
	`96`	`+ restoreGeometry();`
	`97`	`+ }`
`90`	`98`	`raise();`
`91`	`99`	`activateWindow();`
`92`	`100`	`}`
`@@ -133,8 +141,6 @@ void QgsAttributeDialog::init( QgsVectorLayer layer, QgsFeature feature, const`
`133`	`141`	`mMenuBar->addMenu( mMenu );`
`134`	`142`	`layout()->setMenuBar( mMenuBar );`
`135`	`143`	`}`
`136`		`-`
`137`		`- restoreGeometry();`
`138`	`144`	`focusNextChild();`
`139`	`145`	`}`
`140`	`146`