Set window width to account for miniumum width required for visible r…

…ollups.
f4exb · Nov 8, 2022 · ed27981 · ed27981
1 parent fc2e5f5
commit ed27981
Show file tree

Hide file tree

Showing 42 changed files with 164 additions and 144 deletions.
diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
@@ -467,7 +467,8 @@ void ChannelAnalyzerGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp
@@ -369,19 +369,6 @@ void AISDemodGUI::filter()
 
 void AISDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
-    if (widget == ui->scopeContainer)
-    {
-        if (rollDown)
-        {
-            // Make wide enough for scope controls
-            setMinimumWidth(716);
-        }
-        else
-        {
-            setMinimumWidth(352);
-        }
-    }
-
     RollupContents *rollupContents = getRollupContents();
 
     if (rollupContents->hasExpandableWidgets()) {
@@ -391,7 +378,8 @@ void AISDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodais/aisdemodgui.ui b/plugins/channelrx/demodais/aisdemodgui.ui
@@ -721,10 +721,16 @@
     <rect>
      <x>20</x>
      <y>400</y>
-     <width>351</width>
+     <width>716</width>
      <height>341</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>714</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Waveforms</string>
    </property>
@@ -911,15 +917,21 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RollupContents</class>
+   <extends>QWidget</extends>
+   <header>gui/rollupcontents.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>ButtonSwitch</class>
    <extends>QToolButton</extends>
    <header>gui/buttonswitch.h</header>
   </customwidget>
   <customwidget>
-   <class>RollupContents</class>
+   <class>LevelMeterSignalDB</class>
    <extends>QWidget</extends>
-   <header>gui/rollupcontents.h</header>
+   <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -928,12 +940,6 @@
    <header>gui/valuedialz.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>LevelMeterSignalDB</class>
-   <extends>QWidget</extends>
-   <header>gui/levelmeter.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>GLScope</class>
    <extends>QWidget</extends>

diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp
@@ -556,7 +556,8 @@ void APTDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -325,7 +325,8 @@ void BFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.ui b/plugins/channelrx/demodbfm/bfmdemodgui.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>642</width>
+    <width>450</width>
     <height>0</height>
    </size>
   </property>
@@ -48,7 +48,7 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>640</width>
+     <width>450</width>
      <height>0</height>
     </size>
    </property>
@@ -553,7 +553,7 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>640</width>
+     <width>760</width>
      <height>0</height>
     </size>
    </property>

diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
@@ -338,7 +338,8 @@ void ChirpChatDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp
@@ -401,7 +401,8 @@ void DABDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
@@ -257,7 +257,8 @@ void FreeDVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp
@@ -383,7 +383,8 @@ void PacketDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp
@@ -418,19 +418,6 @@ void PagerDemodGUI::filter()
 
 void PagerDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
-    if (widget == ui->scopeContainer)
-    {
-        if (rollDown)
-        {
-            // Make wide enough for scope controls
-            setMinimumWidth(716);
-        }
-        else
-        {
-            setMinimumWidth(352);
-        }
-    }
-
     RollupContents *rollupContents = getRollupContents();
 
     if (rollupContents->hasExpandableWidgets()) {
@@ -440,7 +427,8 @@ void PagerDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodpager/pagerdemodgui.ui b/plugins/channelrx/demodpager/pagerdemodgui.ui
@@ -816,10 +816,16 @@
     <rect>
      <x>20</x>
      <y>400</y>
-     <width>351</width>
+     <width>714</width>
      <height>341</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>714</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Waveforms</string>
    </property>
@@ -1019,10 +1025,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
   </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
@@ -1031,9 +1036,10 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>GLScope</class>

diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
@@ -475,19 +475,6 @@ void RadiosondeDemodGUI::filter()
 
 void RadiosondeDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
-    if (widget == ui->scopeContainer)
-    {
-        if (rollDown)
-        {
-            // Make wide enough for scope controls
-            setMinimumWidth(716);
-        }
-        else
-        {
-            setMinimumWidth(352);
-        }
-    }
-
     RollupContents *rollupContents = getRollupContents();
 
     if (rollupContents->hasExpandableWidgets()) {
@@ -497,7 +484,8 @@ void RadiosondeDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.ui b/plugins/channelrx/demodradiosonde/radiosondedemodgui.ui
@@ -855,10 +855,16 @@
     <rect>
      <x>20</x>
      <y>400</y>
-     <width>351</width>
+     <width>714</width>
      <height>341</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>714</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Waveforms</string>
    </property>
@@ -1061,10 +1067,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
   </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
@@ -1073,9 +1078,10 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>GLScope</class>

diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -316,19 +316,15 @@ void SSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 
     RollupContents *rollupContents = getRollupContents();
 
-    if (rollupContents->hasExpandableWidgets())
-    {
-        qDebug("SSBDemodGUI::onWidgetRolled: set vertical policy expanding");
+    if (rollupContents->hasExpandableWidgets()) {
         setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Expanding);
-    }
-    else
-    {
-        qDebug("SSBDemodGUI::onWidgetRolled: set vertical policy fixed");
+    } else {
         setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed);
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/demodvormc/vordemodmcgui.cpp b/plugins/channelrx/demodvormc/vordemodmcgui.cpp
@@ -1116,7 +1116,8 @@ void VORDemodMCGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();

diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp
@@ -364,7 +364,8 @@ void FileSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
     }
 
     int h = rollupContents->height() + getAdditionalHeight();
-    resize(width(), h);
+    int w = std::max(width(), rollupContents->minimumWidth() + gripSize() * 2);
+    resize(w, h);
 
     rollupContents->saveState(m_rollupState);
     applySettings();