From 69662ac3c823b1d3dcdda9949d9eeaf1dc5a0efb Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Thu, 23 Oct 2025 00:10:27 +0500
Subject: [PATCH] Qt; Layout and size policy tweaks for settings dialog

Fixes comboboxes not always filling the intended space,
as well as oversized Configure buttons and uneven joystick
confugration buttons
---
 src/qt/qt_settingsinput.ui              | 141 +++++++++++++++---------
 src/qt/qt_settingsports.ui              |  39 ++++---
 src/qt/qt_settingssound.ui              |  22 ++--
 src/qt/qt_settingsstoragecontrollers.ui |  12 ++
 4 files changed, 138 insertions(+), 76 deletions(-)

diff --git a/src/qt/qt_settingsinput.ui b/src/qt/qt_settingsinput.ui
index 02b3e388c..e4c0dc8fa 100644
--- a/src/qt/qt_settingsinput.ui
+++ b/src/qt/qt_settingsinput.ui
@@ -30,7 +30,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="1">
     <widget class="QComboBox" name="comboBoxKeyboard">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -43,7 +43,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="2">
     <widget class="QPushButton" name="pushButtonConfigureKeyboard">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -63,7 +63,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
+   <item row="1" column="1">
     <widget class="QComboBox" name="comboBoxMouse">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -76,7 +76,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="1" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMouse">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -96,40 +96,50 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
+   <item row="2" column="1">
     <widget class="QComboBox" name="comboBoxJoystick0">
      <property name="maxVisibleItems">
       <number>30</number>
      </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QPushButton" name="pushButtonJoystick01">
-     <property name="text">
-      <string>Joystick 1...</string>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QPushButton" name="pushButtonJoystick02">
-     <property name="text">
-      <string>Joystick 2...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QPushButton" name="pushButtonJoystick03">
-     <property name="text">
-      <string>Joystick 3...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QPushButton" name="pushButtonJoystick04">
-     <property name="text">
-      <string>Joystick 4...</string>
-     </property>
-    </widget>
+   <item row="3" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="joystickButtonsLayout">
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick01">
+       <property name="text">
+        <string>Joystick 1...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick02">
+       <property name="text">
+        <string>Joystick 2...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick03">
+       <property name="text">
+        <string>Joystick 3...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonJoystick04">
+       <property name="text">
+        <string>Joystick 4...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="labelKeys">
@@ -138,7 +148,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4">
+   <item row="5" column="0" colspan="3">
     <widget class="QTableWidget" name="tableKeys">
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
@@ -157,25 +167,54 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="2">
-    <widget class="QPushButton" name="pushButtonClearBind">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Clear binding</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="3">
-    <widget class="QPushButton" name="pushButtonBind">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Bind</string>
-     </property>
-    </widget>
+   <item row="6" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="keybindButtonsLayout">
+     <item>
+      <spacer name="keybindButtonsHorizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonClearBind">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Clear binding</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonBind">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Bind</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/qt/qt_settingsports.ui b/src/qt/qt_settingsports.ui
index 9a8533995..6be0e3a85 100644
--- a/src/qt/qt_settingsports.ui
+++ b/src/qt/qt_settingsports.ui
@@ -228,6 +228,12 @@
        <property name="text">
         <string>Serial port passthrough 1</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="0" column="1">
@@ -242,6 +248,12 @@
        <property name="text">
         <string>Serial port passthrough 2</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -256,6 +268,12 @@
        <property name="text">
         <string>Serial port passthrough 3</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
@@ -270,6 +288,12 @@
        <property name="text">
         <string>Serial port passthrough 4</string>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="3" column="1">
@@ -279,20 +303,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <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>
-     <item row="5" column="0" colspan="2">
+     <item row="4" column="0" colspan="2">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
diff --git a/src/qt/qt_settingssound.ui b/src/qt/qt_settingssound.ui
index 97ef7c3ff..f93c5d374 100644
--- a/src/qt/qt_settingssound.ui
+++ b/src/qt/qt_settingssound.ui
@@ -46,7 +46,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard1">
      <property name="text">
       <string>Configure</string>
@@ -73,7 +73,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="1" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard2">
      <property name="text">
       <string>Configure</string>
@@ -100,7 +100,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3">
+   <item row="2" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard3">
      <property name="text">
       <string>Configure</string>
@@ -127,7 +127,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="3">
+   <item row="3" column="2">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard4">
      <property name="text">
       <string>Configure</string>
@@ -154,7 +154,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3">
+   <item row="4" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMidiOut">
      <property name="text">
       <string>Configure</string>
@@ -181,35 +181,35 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3">
+   <item row="5" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMidiIn">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="6" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxMPU401">
      <property name="text">
       <string>Standalone MPU-401</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="3">
+   <item row="6" column="2">
     <widget class="QPushButton" name="pushButtonConfigureMPU401">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="10" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxFloat32">
      <property name="text">
       <string>Use FLOAT32 sound</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
+   <item row="11" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -238,7 +238,7 @@
      </layout>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="12" column="0" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui
index 2d6fa9d32..50ebbe7ef 100644
--- a/src/qt/qt_settingsstoragecontrollers.ui
+++ b/src/qt/qt_settingsstoragecontrollers.ui
@@ -40,6 +40,12 @@
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="0" column="2">
@@ -61,6 +67,12 @@
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       </widget>
      </item>
      <item row="1" column="2">