From 40b83b94855988d2a73ff82aaf5572f9752c699d Mon Sep 17 00:00:00 2001
From: Alexander Bruy <alexander.bruy@gmail.com>
Date: Tue, 26 May 2020 11:03:04 +0300
Subject: [PATCH] fix layout of the QgsHistogram widget to prevent histogram
 collapsing on resizing (fix #25197)

(cherry picked from commit abe8481a1ec58e54b6b9b3561367b17e25fd60be)
---
 src/ui/qgshistogramwidgetbase.ui | 140 ++++++++++++-------------------
 1 file changed, 53 insertions(+), 87 deletions(-)

diff --git a/src/ui/qgshistogramwidgetbase.ui b/src/ui/qgshistogramwidgetbase.ui
index afdb8e3349f1..65d9bbc60d4b 100644
--- a/src/ui/qgshistogramwidgetbase.ui
+++ b/src/ui/qgshistogramwidgetbase.ui
@@ -2,58 +2,31 @@
 <ui version="4.0">
  <class>QgsHistogramWidgetBase</class>
  <widget class="QWidget" name="QgsHistogramWidgetBase">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>285</width>
-    <height>245</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>60</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="topMargin">
-      <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QPushButton" name="mLoadValuesButton">
+     <property name="text">
+      <string>Load Values</string>
      </property>
-     <item>
-      <widget class="QPushButton" name="mLoadValuesButton">
-       <property name="text">
-        <string>Load Values</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    </widget>
    </item>
-   <item>
+   <item row="0" column="1" colspan="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>182</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="3">
     <widget class="QwtPlot" name="mpPlot">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -64,51 +37,44 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>30</height>
+       <height>120</height>
       </size>
      </property>
     </widget>
    </item>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_12">
+     <property name="text">
+      <string>Histogram bins</string>
      </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_12">
-       <property name="text">
-        <string>Histogram bins</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QSpinBox" name="mBinsSpinBox">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>999</number>
-       </property>
-       <property name="value">
-        <number>50</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="mMeanCheckBox">
-       <property name="text">
-        <string>Show mean value</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="mStdevCheckBox">
-       <property name="text">
-        <string>Show standard deviation</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QSpinBox" name="mBinsSpinBox">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+     <property name="value">
+      <number>50</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QCheckBox" name="mMeanCheckBox">
+     <property name="text">
+      <string>Show mean value</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QCheckBox" name="mStdevCheckBox">
+     <property name="text">
+      <string>Show standard deviation</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>