From a86413dbb0f032ecfbfe5d6989bd1743310af881 Mon Sep 17 00:00:00 2001
From: Harrissou Sant-anna <delazj@gmail.com>
Date: Mon, 4 May 2020 07:37:29 +0200
Subject: [PATCH] Fix more alignment, spacing and stretching issues

---
 src/gui/qgsfeaturepickerwidget.cpp |  1 +
 src/ui/qgsexpressionbuilder.ui     | 43 ++++--------------------------
 src/ui/qgsexpressionpreviewbase.ui | 24 ++++++++++++-----
 3 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/gui/qgsfeaturepickerwidget.cpp b/src/gui/qgsfeaturepickerwidget.cpp
index ad07ce4108e..eb8a6c37e74 100644
--- a/src/gui/qgsfeaturepickerwidget.cpp
+++ b/src/gui/qgsfeaturepickerwidget.cpp
@@ -42,6 +42,7 @@ QgsFeaturePickerWidget::QgsFeaturePickerWidget( QWidget *parent )
   mNextButton->setEnabled( false );
   mNextButton->setVisible( mShowBrowserButtons );
   layout->addWidget( mNextButton );
+  layout->setContentsMargins( 0, 0, 0, 0 );
 
   setLayout( layout );
 
diff --git a/src/ui/qgsexpressionbuilder.ui b/src/ui/qgsexpressionbuilder.ui
index 9463ad5f522..13956485fd5 100644
--- a/src/ui/qgsexpressionbuilder.ui
+++ b/src/ui/qgsexpressionbuilder.ui
@@ -99,7 +99,7 @@
                <height>0</height>
               </size>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,1,0,1">
+             <layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,1,0,0">
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_10" stretch="0">
                 <item>
@@ -412,21 +412,12 @@
               </item>
               <item>
                <layout class="QGridLayout" name="gridLayout">
-                <property name="sizeConstraint">
-                 <enum>QLayout::SetMinAndMaxSize</enum>
-                </property>
                 <property name="topMargin">
-                 <number>0</number>
+                 <number>3</number>
                 </property>
                 <item row="0" column="0">
                  <widget class="QFrame" name="mExpectedOutputFrame">
                   <layout class="QHBoxLayout" name="horizontalLayout_7">
-                   <property name="spacing">
-                    <number>3</number>
-                   </property>
-                   <property name="sizeConstraint">
-                    <enum>QLayout::SetMinAndMaxSize</enum>
-                   </property>
                    <property name="leftMargin">
                     <number>0</number>
                    </property>
@@ -442,7 +433,7 @@
                    <item>
                     <widget class="QLabel" name="label_3">
                      <property name="sizePolicy">
-                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                        <horstretch>0</horstretch>
                        <verstretch>0</verstretch>
                       </sizepolicy>
@@ -451,41 +442,17 @@
                       <string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
                      </property>
                      <property name="text">
-                      <string>Expected Format:</string>
+                      <string>Expected format:</string>
                      </property>
                     </widget>
                    </item>
                    <item>
                     <widget class="QLabel" name="lblExpected">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
                      <property name="toolTip">
                       <string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
                      </property>
-                     <property name="frameShape">
-                      <enum>QFrame::NoFrame</enum>
-                     </property>
-                     <property name="frameShadow">
-                      <enum>QFrame::Sunken</enum>
-                     </property>
-                     <property name="lineWidth">
-                      <number>0</number>
-                     </property>
-                     <property name="midLineWidth">
-                      <number>0</number>
-                     </property>
                      <property name="text">
-                      <string>string [r,g,b,a] as int 0-255 or #RRGGBBAA as hex or color as color's name</string>
-                     </property>
-                     <property name="textFormat">
-                      <enum>Qt::RichText</enum>
-                     </property>
-                     <property name="scaledContents">
-                      <bool>false</bool>
+                      <string>Help text</string>
                      </property>
                      <property name="wordWrap">
                       <bool>true</bool>
diff --git a/src/ui/qgsexpressionpreviewbase.ui b/src/ui/qgsexpressionpreviewbase.ui
index bd6b2b16455..97ace9e12bb 100644
--- a/src/ui/qgsexpressionpreviewbase.ui
+++ b/src/ui/qgsexpressionpreviewbase.ui
@@ -7,17 +7,29 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>67</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -26,14 +38,14 @@
       <string>Preview:</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="mPreviewLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -42,7 +54,7 @@
       <string>TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -57,7 +69,7 @@
      <item>
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>