Merge branch 'master' into scroll

src/yuzu/configuration/configure_debug.cpp

@@ -14,7 +14,7 @@
 #include "yuzu/debugger/console.h"
 #include "yuzu/uisettings.h"
 
-ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) {
+ConfigureDebug::ConfigureDebug(QWidget* parent) : QScrollArea(parent), ui(new Ui::ConfigureDebug) {
     ui->setupUi(this);
     SetConfiguration();
 

src/yuzu/configuration/configure_debug.h

@@ -5,13 +5,13 @@
 #pragma once
 
 #include <memory>
-#include <QWidget>
+#include <QScrollArea>
 
 namespace Ui {
 class ConfigureDebug;
 }
 
-class ConfigureDebug : public QWidget {
+class ConfigureDebug : public QScrollArea {
     Q_OBJECT
 
 public:

src/yuzu/configuration/configure_debug.ui

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigureDebug</class>
- <widget class="QWidget" name="ConfigureDebug">
+ <widget class="QScrollArea" name="ConfigureDebug">
-  <property name="geometry">
+  <property name="widgetResizable">
-   <rect>
+   <bool>true</bool>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>777</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
   </property>
+  <widget class="QWidget">
    <layout class="QVBoxLayout" name="verticalLayout_1">
     <item>
      <widget class="QGroupBox" name="groupBox_2">
@@ -279,6 +272,7 @@
     </item>
    </layout>
   </widget>
+ </widget>
  <tabstops>
   <tabstop>log_filter_edit</tabstop>
   <tabstop>toggle_console</tabstop>

src/yuzu/configuration/configure_input_player.cpp

@@ -219,10 +219,10 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
                                            QWidget* bottom_row,
                                            InputCommon::InputSubsystem* input_subsystem_,
                                            InputProfiles* profiles_, bool debug)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputPlayer>()), player_index(player_index),
+    : QScrollArea(parent), ui(std::make_unique<Ui::ConfigureInputPlayer>()),
-      debug(debug), input_subsystem{input_subsystem_}, profiles(profiles_),
+      player_index(player_index), debug(debug), input_subsystem{input_subsystem_},
-      timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()),
+      profiles(profiles_), timeout_timer(std::make_unique<QTimer>()),
-      bottom_row(bottom_row) {
+      poll_timer(std::make_unique<QTimer>()), bottom_row(bottom_row) {
     ui->setupUi(this);
 
     setFocusPolicy(Qt::ClickFocus);

src/yuzu/configuration/configure_input_player.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <QWidget>
+#include <QScrollArea>
 
 #include "common/param_package.h"
 #include "common/settings.h"
@@ -42,7 +42,7 @@ namespace Ui {
 class ConfigureInputPlayer;
 }
 
-class ConfigureInputPlayer : public QWidget {
+class ConfigureInputPlayer : public QScrollArea {
     Q_OBJECT
 
 public:

src/yuzu/configuration/configure_input_player.ui

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigureInputPlayer</class>
- <widget class="QWidget" name="ConfigureInputPlayer">
+ <widget class="QScrollArea" name="ConfigureInputPlayer">
-  <property name="geometry">
+  <property name="widgetResizable">
-   <rect>
+   <bool>true</bool>
-    <x>0</x>
-    <y>0</y>
-    <width>780</width>
-    <height>487</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Configure Input</string>
   </property>
+  <widget class="QWidget">
    <layout class="QHBoxLayout" name="horizontalLayout_2">
     <property name="spacing">
      <number>0</number>
@@ -3131,6 +3124,7 @@
     </item>
    </layout>
   </widget>
+  </widget>
   <customwidgets>
     <customwidget>
       <class>PlayerControlPreview</class>