Qt: Use nested layouts in controller settings dialog

Gets rid of the gaps but doesn't require rearranging.

src/duckstation-qt/controllerglobalsettingswidget.cpp

@@ -77,12 +77,12 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
     ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableRawInput, "InputSources", "RawInput",
                                                                 false);
 #else
-    m_ui.mainLayout->removeWidget(m_ui.xinputGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.xinputGroup);
     QtUtils::SafeDeleteWidget(m_ui.xinputGroup);
     m_ui.xinputLayout = nullptr;
     m_ui.enableXInputSource = nullptr;
     m_ui.xinputDescription = nullptr;
-    m_ui.mainLayout->removeWidget(m_ui.dinputGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.dinputGroup);
     QtUtils::SafeDeleteWidget(m_ui.dinputGroup);
     m_ui.dinputLayout = nullptr;
     m_ui.enableDInputSource = nullptr;
@@ -109,7 +109,7 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
   }
   else
   {
-    m_ui.mainLayout->removeWidget(m_ui.sdlGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.sdlGroup);
     QtUtils::SafeDeleteWidget(m_ui.sdlGroup);
     m_ui.sdlGridLayout = nullptr;
     m_ui.sdlLEDLayout = nullptr;
@@ -119,17 +119,17 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
     m_ui.enableSDLEnhancedMode = nullptr;
     m_ui.sdlHelpText = nullptr;
     m_ui.enableTouchPadAsPointer = nullptr;
-    m_ui.mainLayout->removeWidget(m_ui.xinputGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.xinputGroup);
     QtUtils::SafeDeleteWidget(m_ui.xinputGroup);
     m_ui.xinputLayout = nullptr;
     m_ui.enableXInputSource = nullptr;
     m_ui.xinputDescription = nullptr;
-    m_ui.mainLayout->removeWidget(m_ui.dinputGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.dinputGroup);
     QtUtils::SafeDeleteWidget(m_ui.dinputGroup);
     m_ui.dinputLayout = nullptr;
     m_ui.enableDInputSource = nullptr;
     m_ui.dinputDescription = nullptr;
-    m_ui.mainLayout->removeWidget(m_ui.pointerGroup);
+    m_ui.groupsLayout->removeWidget(m_ui.pointerGroup);
     QtUtils::SafeDeleteWidget(m_ui.pointerGroup);
     m_ui.pointerLayout = nullptr;
     m_ui.pointerDescription = nullptr;

src/duckstation-qt/controllerglobalsettingswidget.ui

@@ -10,7 +10,7 @@
     <height>658</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="mainLayout" columnstretch="1,0">
+  <layout class="QHBoxLayout" name="mainLayout" stretch="1,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -23,7 +23,9 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
+   <item>
+    <layout class="QVBoxLayout" name="groupsLayout">
+     <item>
       <widget class="QGroupBox" name="sdlGroup">
        <property name="title">
         <string>SDL Input Source</string>
@@ -108,7 +110,7 @@
        </layout>
       </widget>
      </item>
-   <item row="1" column="0">
+     <item>
       <widget class="QGroupBox" name="xinputGroup">
        <property name="title">
         <string>XInput Source</string>
@@ -134,7 +136,7 @@
        </layout>
       </widget>
      </item>
-   <item row="2" column="0">
+     <item>
       <widget class="QGroupBox" name="dinputGroup">
        <property name="title">
         <string>DirectInput Source</string>
@@ -160,7 +162,7 @@
        </layout>
       </widget>
      </item>
-   <item row="3" column="0">
+     <item>
       <widget class="QGroupBox" name="pointerGroup">
        <property name="title">
         <string>Mouse/Pointer Source</string>
@@ -313,7 +315,7 @@
        </layout>
       </widget>
      </item>
-   <item row="4" column="0">
+     <item>
       <widget class="QGroupBox" name="multitapGroup">
        <property name="title">
         <string>Controller Multitap</string>
@@ -342,7 +344,7 @@
        </layout>
       </widget>
      </item>
-   <item row="5" column="0">
+     <item>
       <widget class="QGroupBox" name="profileSettings">
        <property name="title">
         <string>Profile Settings</string>
@@ -375,14 +377,22 @@
        </layout>
       </widget>
      </item>
-   <item row="6" column="0">
+     <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Orientation::Vertical</enum>
        </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
       </spacer>
      </item>
-   <item row="0" column="1" rowspan="7">
+    </layout>
+   </item>
+   <item>
     <widget class="QGroupBox" name="deviceListGroup">
      <property name="title">
       <string>Detected Devices</string>