[AttributeForm] respect size policy of embedded widgets (#45990)

* [AttributeForm] respect size policy of embedded widgets This let widgets wich can make use of more vertical space grow togheter with the form dialog * Check for more not expanding policies
qgis · Nov 11, 2021 · 1e8f64d · 1e8f64d
1 parent a2de61c
commit 1e8f64d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -1561,6 +1561,7 @@ void QgsAttributeForm::init()
     int column = 0;
     int columnCount = 1;
     bool hasRootFields = false;
+    bool addSpacer = true;
 
     const QList<QgsAttributeEditorElement *> tabs = mLayer->editFormConfig().tabs();
 
@@ -1640,6 +1641,12 @@ void QgsAttributeForm::init()
 
         label->setBuddy( widgetInfo.widget );
 
+        // If at least one expanding widget is present do not add a spacer
+        if ( widgetInfo.widget->sizePolicy().verticalPolicy() != QSizePolicy::Fixed
+             && widgetInfo.widget->sizePolicy().verticalPolicy() != QSizePolicy::Maximum
+             && widgetInfo.widget->sizePolicy().verticalPolicy() != QSizePolicy::Preferred )
+          addSpacer = false;
+
         if ( !widgetInfo.showLabel )
         {
           QVBoxLayout *c = new QVBoxLayout();
@@ -1690,7 +1697,7 @@ void QgsAttributeForm::init()
       }
     }
 
-    if ( hasRootFields )
+    if ( hasRootFields && addSpacer )
     {
       QSpacerItem *spacerItem = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
       layout->addItem( spacerItem, row, 0 );

diff --git a/src/gui/qgsattributeformeditorwidget.cpp b/src/gui/qgsattributeformeditorwidget.cpp
@@ -46,7 +46,7 @@ QgsAttributeFormEditorWidget::QgsAttributeFormEditorWidget( QgsEditorWidgetWrapp
 
   mMultiEditButton->setField( mEditorWidget->field() );
   mAggregateButton = new QgsAggregateToolButton();
-  mAggregateButton->setType( editorWidget->field().type() );
+  mAggregateButton->setType( mEditorWidget->field().type() );
   connect( mAggregateButton, &QgsAggregateToolButton::aggregateChanged, this, &QgsAttributeFormEditorWidget::onAggregateChanged );
 
   if ( mEditorWidget->widget() )

diff --git a/src/gui/qgsattributeformwidget.cpp b/src/gui/qgsattributeformwidget.cpp
@@ -60,6 +60,9 @@ QgsAttributeFormWidget::QgsAttributeFormWidget( QgsWidgetWrapper *widget, QgsAtt
 
   mEditPage->layout()->addWidget( mWidget->widget() );
 
+  // Respect size policy of embedded widget
+  setSizePolicy( mWidget->widget()->sizePolicy() );
+
   updateWidgets();
 }