Fix layout problems with relation reference widget

m-kuhn · m-kuhn · commit 7bcc935f4dd7 · 2015-11-23T22:24:52.000+01:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -83,7 +83,9 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
 {
   mTopLayout = new QVBoxLayout( this );
   mTopLayout->setContentsMargins( 0, 0, 0, 0 );
-  mTopLayout->setAlignment( Qt::AlignTop );
+
+  setSizePolicy( sizePolicy().horizontalPolicy(), QSizePolicy::Fixed );
+
   setLayout( mTopLayout );
 
   QHBoxLayout* editLayout = new QHBoxLayout();
@@ -142,9 +144,6 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
   mRemoveFKButton->setText( tr( "No selection" ) );
   editLayout->addWidget( mRemoveFKButton );
 
-  // spacer
-  editLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding ) );
-
   // add line to top layout
   mTopLayout->addLayout( editLayout );
 
@@ -379,6 +378,12 @@ void QgsRelationReferenceWidget::setEditorContext( const QgsAttributeEditorConte
 
 void QgsRelationReferenceWidget::setEmbedForm( bool display )
 {
+  if ( display )
+  {
+    setSizePolicy( sizePolicy().horizontalPolicy(), QSizePolicy::MinimumExpanding );
+    mTopLayout->setAlignment( Qt::AlignTop );
+  }
+
   mAttributeEditorFrame->setVisible( display );
   mEmbedForm = display;
 }
@@ -484,6 +489,10 @@ void QgsRelationReferenceWidget::init()
         }
       }
     }
+    else
+    {
+      mFilterContainer->hide();
+    }
 
     QgsExpression exp( mReferencedLayer->displayExpression() );
 
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -30,7 +30,6 @@ QgsRelationReferenceWidgetWrapper::QgsRelationReferenceWidgetWrapper( QgsVectorL
 QWidget* QgsRelationReferenceWidgetWrapper::createWidget( QWidget* parent )
 {
   QgsRelationReferenceWidget* w = new QgsRelationReferenceWidget( parent );
-  w->setSizePolicy( w->sizePolicy().horizontalPolicy(), QSizePolicy::Expanding );
   return w;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ QgsRelationReferenceWidgetWrapper::QgsRelationReferenceWidgetWrapper( QgsVectorL`
`30`	`30`	`QWidget* QgsRelationReferenceWidgetWrapper::createWidget( QWidget* parent )`
`31`	`31`	`{`
`32`	`32`	`QgsRelationReferenceWidget* w = new QgsRelationReferenceWidget( parent );`
`33`		`- w->setSizePolicy( w->sizePolicy().horizontalPolicy(), QSizePolicy::Expanding );`
`34`	`33`	`return w;`
`35`	`34`	`}`
`36`	`35`