Fix more scaling issues

timschneeb · timschneeb · commit a6a43b02523a · 2021-10-18T13:18:07.000+02:00
diff --git a/3rdparty/WAF/Animation/SideSlide/SideSlideAnimator.cpp b/3rdparty/WAF/Animation/SideSlide/SideSlideAnimator.cpp
@@ -284,6 +284,7 @@ bool SideSlideAnimator::eventFilter(QObject* _object, QEvent* _event)
 {
     if (_object == widgetForSlide()->parentWidget()
         && _event->type() == QEvent::Resize) {
+
         QWidget* widgetForSlideParent = widgetForSlide()->parentWidget();
         switch (m_side) {
             case WAF::RightSide: {
@@ -309,6 +310,8 @@ bool SideSlideAnimator::eventFilter(QObject* _object, QEvent* _event)
             }
         }
 
+        m_decorator->setSlidePos(widgetForSlide()->geometry().topLeft());
+
         //
         // Сохраним картинку изменённого выкатываемого виджета
         //
diff --git a/3rdparty/WAF/Animation/SideSlide/SideSlideDecorator.cpp b/3rdparty/WAF/Animation/SideSlide/SideSlideDecorator.cpp
@@ -74,9 +74,9 @@ QPoint SideSlideDecorator::slidePos() const
     return m_slidePos;
 }
 
-void SideSlideDecorator::setSlidePos(const QPoint& _pos)
+void SideSlideDecorator::setSlidePos(const QPoint& _pos, bool noCheck)
 {
-    if (m_slidePos != _pos) {
+    if (m_slidePos != _pos || noCheck) {
         m_slidePos = _pos;
         update();
     }
diff --git a/3rdparty/WAF/Animation/SideSlide/SideSlideDecorator.h b/3rdparty/WAF/Animation/SideSlide/SideSlideDecorator.h
@@ -45,7 +45,7 @@ namespace WAF
         /**
          * @brief Установить позицию выкатываемого виджета
          */
-        void setSlidePos(const QPoint& _pos);
+        void setSlidePos(const QPoint& _pos, bool noCheck = false);
 
     signals:
         /**
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -360,6 +360,18 @@ MainWindow::MainWindow(QString  exepath,
 
 	// Init 3-dot menu button
 	{
+        // Fix tool button height
+        int tbSize = ui->disableFX->height() - 4;
+        ui->set->setMinimumSize(tbSize + 3, tbSize);
+        ui->toolButton->setMinimumSize(tbSize + 3, tbSize);
+        ui->cpreset->setMinimumSize(tbSize + 3, tbSize);
+
+        ui->set->setIconSize(QSize(16,16));
+        ui->cpreset->setIconSize(QSize(16,16));
+        ui->toolButton->setIconSize(QSize(16,16));
+        ui->disableFX->setIconSize(QSize(16,16));
+
+
 		QMenu *menu = new QMenu();
         menu->addAction(tr("Apps"),   this, [this]()
         {
@@ -374,9 +386,12 @@ MainWindow::MainWindow(QString  exepath,
             hostLayout->addWidget(sd);
             host->hide();
             host->setAutoFillBackground(true);
-            connect(sd, &StatusFragment::closePressed, this, [host]() {
+            connect(sd, &StatusFragment::closePressed, this, [host,sd]() {
                 WAF::Animation::sideSlideOut(host, WAF::BottomSide);
+                host->deleteLater();
+                sd->deleteLater();
             });
+            host->setMaximumHeight(this->height() - 20);
             WAF::Animation::sideSlideIn(host, WAF::BottomSide);
         });
         menu->addAction(tr("Relink audio pipeline"),   this, SLOT(restart()));
@@ -589,6 +604,7 @@ void MainWindow::dialogHandler()
 {
 	if (sender() == ui->set)
 	{
+        settingsFragmentHost->setMaximumHeight(this->height() - 20);
 		WAF::Animation::sideSlideIn(settingsFragmentHost, WAF::BottomSide);
 	}
 	else if (sender() == ui->cpreset)
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
@@ -74,7 +74,7 @@
          <item>
           <widget class="QStackedWidget" name="tabhost">
            <property name="currentIndex">
-            <number>6</number>
+            <number>2</number>
            </property>
            <widget class="QWidget" name="tabHostPage1">
             <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1253,7 +1253,7 @@
             <property name="whatsThis">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Interpolating FIR Equalizer&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Enables/disables the FIR equalizer. FIR stands for &amp;quot;Finite Impulse Response&amp;quot;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Filter type:&lt;/span&gt; Chooses between Minimum phase and Linear phase filtering. The minimum phase is the recommended filter type, as it minimizes latency (effectively zero for any sensible filter shape). In contrast, the phase changes introduced are not usually noticeable (linear phase is helpful in pre-/post-production of multitrack recordings, where phase relationships between tracks need to be preserved. However, in real-time playback, linear phase EQ introduces latency at least half as long as the filter length.)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
+            <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="7,2">
              <property name="spacing">
               <number>11</number>
              </property>
@@ -1272,7 +1272,7 @@
              <item>
               <widget class="QStackedWidget" name="eq_holder">
                <property name="currentIndex">
-                <number>1</number>
+                <number>0</number>
                </property>
                <widget class="QWidget" name="page_fixed_eq">
                 <layout class="QHBoxLayout" name="horizontalLayout_11">
@@ -1330,6 +1330,12 @@
                </property>
                <item>
                 <widget class="QCheckBox" name="enable_eq">
+                 <property name="minimumSize">
+                  <size>
+                   <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
                  <property name="maximumSize">
                   <size>
                    <width>130</width>
@@ -1343,9 +1349,15 @@
                </item>
                <item>
                 <widget class="QComboBox" name="eqpreset">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1358,9 +1370,15 @@
                </item>
                <item>
                 <widget class="QComboBox" name="eqfiltertype">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1381,9 +1399,15 @@
                </item>
                <item>
                 <widget class="QComboBox" name="eqinterpolator">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1407,9 +1431,15 @@
                </item>
                <item>
                 <widget class="QPushButton" name="reseteq">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1435,6 +1465,12 @@
                   </property>
                   <item>
                    <widget class="QRadioButton" name="eq_r_fixed">
+                    <property name="minimumSize">
+                     <size>
+                      <width>130</width>
+                      <height>0</height>
+                     </size>
+                    </property>
                     <property name="text">
                      <string>Fixed bands</string>
                     </property>
@@ -1445,6 +1481,12 @@
                   </item>
                   <item>
                    <widget class="QRadioButton" name="eq_r_flex">
+                    <property name="minimumSize">
+                     <size>
+                      <width>130</width>
+                      <height>0</height>
+                     </size>
+                    </property>
                     <property name="text">
                      <string>Flexible bands</string>
                     </property>
@@ -1480,7 +1522,7 @@
             <property name="whatsThis">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Convolver&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Partitioned convolver (Auto segmenting convolution). Select your impulse response file to be convolved. It takes the signal characteristics of the impulse response and applies them to the incoming audio in real-time.&lt;/p&gt;&lt;p&gt;Supports mono, stereo, full/true stereo (LL, LR, RL, RR) impulse responses.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Impulse response optimization:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;This parameter attempts to reduce the length of the impulse response as much as possible; the whole point is to reduce latency as much as possible, possibly reducing power consumption.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,1">
+            <layout class="QHBoxLayout" name="horizontalLayout" stretch="7,2">
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -1640,9 +1682,15 @@
               <layout class="QVBoxLayout" name="verticalLayout_17">
                <item>
                 <widget class="QCheckBox" name="conv_enable">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1660,9 +1708,15 @@
                </item>
                <item>
                 <widget class="QComboBox" name="conv_ir_opt">
-                 <property name="maximumSize">
+                 <property name="minimumSize">
                   <size>
                    <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
                    <height>16777215</height>
                   </size>
                  </property>
@@ -1692,6 +1746,18 @@
                </item>
                <item>
                 <widget class="QPushButton" name="conv_adv_wave_edit">
+                 <property name="minimumSize">
+                  <size>
+                   <width>130</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
                  <property name="text">
                   <string>Edit</string>
                  </property>
@@ -1721,7 +1787,7 @@
             <property name="whatsThis">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;ViPER-DDC&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Its main job is to perform parametric equalization on audio, however it requires the user to provide a .vdc file that DDCToolbox generates.&lt;/p&gt;&lt;p&gt;ViPER-DDC in jDSP is a generalized implementation of second-order section filters, which is slightly different from the implementation in Viper4Android. V4A supports only Peaking parametric; the reason is that V4A uses a share coefficient property of Peaking filter. In contrast, jDSP does not have such an assumption.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_10" stretch="6,0">
+            <layout class="QHBoxLayout" name="horizontalLayout_10" stretch="7,2">
              <property name="leftMargin">
               <number>0</number>
              </property>
diff --git a/src/interface/dialog/AutoEqSelector.cpp b/src/interface/dialog/AutoEqSelector.cpp
@@ -12,8 +12,7 @@ AutoEQSelector::AutoEQSelector(QWidget *parent) :
 	QDialog(parent),
 	ui(new Ui::AutoEQSelector)
 {
-	ui->setupUi(this);
-	setFixedSize(geometry().width(), geometry().height());
+    ui->setupUi(this);
 	ui->listWidget->setItemDelegate(new ItemSizeDelegate);
 
 	imgSizeCache = ui->picture->size() * 11.5;
diff --git a/src/interface/fragment/AppManagerFragment.ui b/src/interface/fragment/AppManagerFragment.ui
@@ -19,7 +19,7 @@
   <property name="maximumSize">
    <size>
     <width>16777215</width>
-    <height>310</height>
+    <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -76,6 +76,9 @@
    </item>
    <item>
     <widget class="CListView" name="apps">
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+     </property>
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
@@ -106,6 +109,9 @@
      <property name="spacing">
       <number>1</number>
      </property>
+     <property name="uniformItemSizes">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
   </layout>
diff --git a/src/interface/fragment/SettingsFragment.ui b/src/interface/fragment/SettingsFragment.ui
@@ -13,13 +13,13 @@
   <property name="minimumSize">
    <size>
     <width>685</width>
-    <height>0</height>
+    <height>350</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>685</width>
-    <height>350</height>
+    <width>16777215</width>
+    <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -50,7 +50,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="4,0">
+    <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="1,4">
      <property name="topMargin">
       <number>0</number>
      </property>
@@ -125,7 +125,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>2</number>
+        <number>3</number>
        </property>
        <widget class="QWidget" name="interface_2">
         <property name="maximumSize">
diff --git a/src/interface/fragment/StatusFragment.ui b/src/interface/fragment/StatusFragment.ui
@@ -13,7 +13,7 @@
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>0</height>
+    <height>250</height>
    </size>
   </property>
   <property name="maximumSize">
diff --git a/src/interface/model/AppItem.cpp b/src/interface/model/AppItem.cpp
@@ -5,14 +5,21 @@
 #include "config/AppConfig.h"
 #include "utils/Log.h"
 
-AppItem::AppItem(AppItemModel* model, uint id, QWidget *parent) :
+AppItem::AppItem(AppItemModel* _model, int id, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AppItem),
-    model(model),
     id(id)
 {
     ui->setupUi(this);
 
+    // Dummy mode
+    if(id == -1)
+    {
+        return;
+    }
+
+    model = _model;
+
 #ifdef USE_PULSEAUDIO
     ui->blocklist->hide();
 #endif
diff --git a/src/interface/model/AppItem.h b/src/interface/model/AppItem.h
diff --git a/src/interface/model/AppItemStyleDelegate.h b/src/interface/model/AppItemStyleDelegate.h
diff --git a/src/subprojects/FlatTabWidget/flattabwidget.cpp b/src/subprojects/FlatTabWidget/flattabwidget.cpp
diff --git a/src/subprojects/GraphicEQWidget/GraphicEQFilterGUI.ui b/src/subprojects/GraphicEQWidget/GraphicEQFilterGUI.ui

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ bool SideSlideAnimator::eventFilter(QObject* _object, QEvent* _event)`
`284`	`284`	`{`
`285`	`285`	`if (_object == widgetForSlide()->parentWidget()`
`286`	`286`	`&& _event->type() == QEvent::Resize) {`
	`287`	`+`
`287`	`288`	`QWidget* widgetForSlideParent = widgetForSlide()->parentWidget();`
`288`	`289`	`switch (m_side) {`
`289`	`290`	`case WAF::RightSide: {`
`@@ -309,6 +310,8 @@ bool SideSlideAnimator::eventFilter(QObject* _object, QEvent* _event)`
`309`	`310`	`}`
`310`	`311`	`}`
`311`	`312`
	`313`	`+ m_decorator->setSlidePos(widgetForSlide()->geometry().topLeft());`
	`314`	`+`
`312`	`315`	`//`
`313`	`316`	`// Сохраним картинку изменённого выкатываемого виджета`
`314`	`317`	`//`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ QPoint SideSlideDecorator::slidePos() const`
`74`	`74`	`return m_slidePos;`
`75`	`75`	`}`
`76`	`76`
`77`		`-void SideSlideDecorator::setSlidePos(const QPoint& _pos)`
	`77`	`+void SideSlideDecorator::setSlidePos(const QPoint& _pos, bool noCheck)`
`78`	`78`	`{`
`79`		`- if (m_slidePos != _pos) {`
	`79`	`+ if (m_slidePos != _pos \|\| noCheck) {`
`80`	`80`	`m_slidePos = _pos;`
`81`	`81`	`update();`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ AutoEQSelector::AutoEQSelector(QWidget *parent) :`
`12`	`12`	`QDialog(parent),`
`13`	`13`	`ui(new Ui::AutoEQSelector)`
`14`	`14`	`{`
`15`		`- ui->setupUi(this);`
`16`		`- setFixedSize(geometry().width(), geometry().height());`
	`15`	`+ ui->setupUi(this);`
`17`	`16`	`ui->listWidget->setItemDelegate(new ItemSizeDelegate);`
`18`	`17`
`19`	`18`	`imgSizeCache = ui->picture->size() * 11.5;`