Merge c6d7dfaee7 into 3a991f3aef

src/yuzu/configuration/configure_input_player.cpp

@@ -291,7 +291,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
                                            InputCommon::InputSubsystem* input_subsystem_,
                                            InputProfiles* profiles_, Core::HID::HIDCore& hid_core_,
                                            bool is_powered_on_, bool debug_)
-    : QWidget(parent),
+    : QScrollArea(parent),
       ui(std::make_unique<Ui::ConfigureInputPlayer>()), player_index{player_index_}, debug{debug_},
       is_powered_on{is_powered_on_}, input_subsystem{input_subsystem_}, profiles(profiles_),
       timeout_timer(std::make_unique<QTimer>()),

src/yuzu/configuration/configure_input_player.h

@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <QWidget>
+#include <QScrollArea>
 
 #include "common/param_package.h"
 #include "common/settings.h"
@@ -46,7 +46,7 @@ class EmulatedController;
 enum class NpadStyleIndex : u8;
 } // namespace Core::HID
 
-class ConfigureInputPlayer : public QWidget {
+class ConfigureInputPlayer : public QScrollArea {
     Q_OBJECT
 
 public:

src/yuzu/configuration/configure_input_player.ui

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigureInputPlayer</class>
- <widget class="QWidget" name="ConfigureInputPlayer">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
+ <widget class="QScrollArea" name="ConfigureInputPlayer">
+  <widget class="QWidget">
+    <property name="minimumSize">
+     <size>
       <width>780</width>
-    <height>487</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Configure Input</string>
+      <height>800</height>
+     </size>
     </property>
    <layout class="QHBoxLayout" name="horizontalLayout_2">
     <property name="spacing">
@@ -154,11 +150,8 @@
            </property>
            <item>
             <widget class="QComboBox" name="comboProfiles">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>21</height>
-             </size>
+             <property name="minimumContentsLength">
+              <number>20</number>
              </property>
             </widget>
            </item>
@@ -1332,7 +1325,7 @@
                          <property name="maximumSize">
                            <size>
                              <width>70</width>
-                            <height>15</height>
+                             <height>20</height>
                            </size>
                          </property>
                          <property name="maximum">
@@ -1779,7 +1772,7 @@
                          <property name="maximumSize">
                            <size>
                              <width>70</width>
-                            <height>15</height>
+                             <height>20</height>
                            </size>
                          </property>
                          <property name="maximum">
@@ -3074,6 +3067,7 @@
     </item>
    </layout>
   </widget>
+ </widget>
   <customwidgets>
     <customwidget>
       <class>PlayerControlPreview</class>