From 08d4dbd5b8a5f297065f2806a5d4b4929e910c9c Mon Sep 17 00:00:00 2001
From: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
Date: Thu, 26 Nov 2020 14:16:58 +0100
Subject: [PATCH 2/5] qtgui: Resize the windows properly in gui sink

---
 gr-qtgui/include/gnuradio/qtgui/displayform.h |  1 -
 gr-qtgui/lib/displayform.cc                   |  6 -----
 gr-qtgui/lib/spectrumdisplayform.cc           | 15 +++++++----
 gr-qtgui/lib/spectrumdisplayform.ui           | 26 ++++++++++++-------
 4 files changed, 26 insertions(+), 22 deletions(-)

--- a/gr-qtgui/lib/displayform.cc
+++ b/gr-qtgui/lib/displayform.cc
@@ -156,12 +156,6 @@
     // deleted
 }
 
-void DisplayForm::resizeEvent(QResizeEvent* e)
-{
-    // QSize s = size();
-    // emit d_display_plot->resizeSlot(&s);
-}
-
 void DisplayForm::mousePressEvent(QMouseEvent* e)
 {
     bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers();
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -328,6 +328,15 @@
 void SpectrumDisplayForm::resizeEvent(QResizeEvent* e)
 {
     QSize s;
+    s.setWidth(e->size().width() - 40);
+    s.setHeight(e->size().height() - 160);
+    TimeDomainDisplayFrame->resize(s);
+    ConstellationDisplayFrame->resize(s);
+    s.setHeight(e->size().height() - 205);
+    FrequencyPlotDisplayFrame->resize(s);
+    s.setHeight(e->size().height() - 240);
+    WaterfallPlotDisplayFrame->resize(s);
+
     s.setWidth(FrequencyPlotDisplayFrame->width());
     s.setHeight(FrequencyPlotDisplayFrame->height());
     emit _frequencyDisplayPlot->resizeSlot(&s);
@@ -421,11 +430,7 @@
 }
 
 
-void SpectrumDisplayForm::tabChanged(int index)
-{
-    // This might be dangerous to call this with NULL
-    resizeEvent(NULL);
-}
+void SpectrumDisplayForm::tabChanged(int index) { update(); }
 
 void SpectrumDisplayForm::setFrequencyRange(const double newCenterFrequency,
                                             const double newStartFrequency,
--- a/gr-qtgui/lib/spectrumdisplayform.ui
+++ b/gr-qtgui/lib/spectrumdisplayform.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>712</width>
-    <height>560</height>
+    <height>575</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -163,7 +163,7 @@
    <item row="0" column="0" colspan="4">
     <widget class="QTabWidget" name="SpectrumTypeTab">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="FrequencyPage">
       <attribute name="title">
@@ -304,7 +304,7 @@
         <widget class="QLabel" name="textLabel1">
          <property name="maximumSize">
           <size>
-           <width>130</width>
+           <width>170</width>
            <height>16777215</height>
           </size>
          </property>
@@ -330,7 +330,10 @@
          <property name="focusPolicy">
           <enum>Qt::ClickFocus</enum>
          </property>
-         <property name="valid">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="valid" stdset="0">
           <bool>true</bool>
          </property>
         </widget>
@@ -375,15 +378,18 @@
            <height>0</height>
           </size>
          </property>
-         <property name="valid">
-          <bool>true</bool>
-         </property>
          <property name="mouseTracking">
           <bool>true</bool>
          </property>
          <property name="focusPolicy">
           <enum>Qt::ClickFocus</enum>
          </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="valid" stdset="0">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="2" column="3">
@@ -406,7 +412,7 @@
         <widget class="QPushButton" name="WaterfallAutoScaleBtn">
          <property name="maximumSize">
           <size>
-           <width>80</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
@@ -517,11 +523,11 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
- <customwidget>
+  <customwidget>
    <class>QwtSlider</class>
    <extends>QWidget</extends>
    <header>qwt_slider.h</header>
- </customwidget>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>SpectrumTypeTab</tabstop>
--- a/gr-qtgui/include/gnuradio/qtgui/displayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h
@@ -53,7 +53,6 @@
     void enableMenu(bool en = true);
 
 public slots:
-    void resizeEvent(QResizeEvent* e);
     void mousePressEvent(QMouseEvent* e);
     virtual void customEvent(QEvent* e) = 0;
 
