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,283 +1,277 @@
 <?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">
+  <widget class="QWidget">
-   <string>Form</string>
+   <layout class="QVBoxLayout" name="verticalLayout_1">
-  </property>
+    <item>
-  <layout class="QVBoxLayout" name="verticalLayout_1">
+     <widget class="QGroupBox" name="groupBox_2">
-   <item>
+      <property name="title">
-    <widget class="QGroupBox" name="groupBox_2">
+       <string>Logging</string>
-     <property name="title">
+      </property>
-      <string>Logging</string>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
-     </property>
+       <item>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
+         <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <widget class="QLabel" name="label_1">
-        <item>
+           <property name="text">
-         <widget class="QLabel" name="label_1">
+            <string>Global Log Filter</string>
-          <property name="text">
+           </property>
-           <string>Global Log Filter</string>
+          </widget>
-          </property>
+         </item>
-         </widget>
+         <item>
-        </item>
+          <widget class="QLineEdit" name="log_filter_edit"/>
-        <item>
+         </item>
-         <widget class="QLineEdit" name="log_filter_edit"/>
+        </layout>
-        </item>
+       </item>
-       </layout>
+       <item>
-      </item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <item>
+         <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <widget class="QCheckBox" name="toggle_console">
-        <item>
+           <property name="text">
-         <widget class="QCheckBox" name="toggle_console">
+            <string>Show Log in Console</string>
-          <property name="text">
+           </property>
-           <string>Show Log in Console</string>
+          </widget>
-          </property>
+         </item>
-         </widget>
+         <item>
-        </item>
+          <widget class="QPushButton" name="open_log_button">
-        <item>
+           <property name="text">
-         <widget class="QPushButton" name="open_log_button">
+            <string>Open Log Location</string>
-          <property name="text">
+           </property>
-           <string>Open Log Location</string>
+          </widget>
-          </property>
+         </item>
-         </widget>
+        </layout>
-        </item>
+       </item>
-       </layout>
+       <item>
-      </item>
+        <widget class="QCheckBox" name="extended_logging">
-      <item>
+         <property name="enabled">
-       <widget class="QCheckBox" name="extended_logging">
+          <bool>true</bool>
-        <property name="enabled">
+         </property>
-         <bool>true</bool>
+         <property name="toolTip">
-        </property>
+          <string>When checked, the max size of the log increases from 100 MB to 1 GB</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, the max size of the log increases from 100 MB to 1 GB</string>
+         <property name="text">
-        </property>
+          <string>Enable Extended Logging</string>
-        <property name="text">
+         </property>
-         <string>Enable Extended Logging</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QLabel" name="label_2">
-      <item>
+         <property name="font">
-       <widget class="QLabel" name="label_2">
+          <font>
-        <property name="font">
+           <italic>true</italic>
-         <font>
+          </font>
-          <italic>true</italic>
+         </property>
-         </font>
+         <property name="text">
-        </property>
+          <string>This will be reset automatically when yuzu closes.</string>
-        <property name="text">
+         </property>
-         <string>This will be reset automatically when yuzu closes.</string>
+         <property name="indent">
-        </property>
+          <number>20</number>
-        <property name="indent">
+         </property>
-         <number>20</number>
+        </widget>
-        </property>
+       </item>
-       </widget>
+      </layout>
-      </item>
+     </widget>
-     </layout>
+    </item>
-    </widget>
+    <item>
-   </item>
+     <widget class="QGroupBox" name="groupBox_3">
-   <item>
+      <property name="title">
-    <widget class="QGroupBox" name="groupBox_3">
+       <string>Homebrew</string>
-     <property name="title">
+      </property>
-      <string>Homebrew</string>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
-     </property>
+       <item>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
-      <item>
+         <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <widget class="QLabel" name="label_3">
-        <item>
+           <property name="text">
-         <widget class="QLabel" name="label_3">
+            <string>Arguments String</string>
-          <property name="text">
+           </property>
-           <string>Arguments String</string>
+          </widget>
-          </property>
+         </item>
-         </widget>
+         <item>
-        </item>
+          <widget class="QLineEdit" name="homebrew_args_edit"/>
-        <item>
+         </item>
-         <widget class="QLineEdit" name="homebrew_args_edit"/>
+        </layout>
-        </item>
+       </item>
-       </layout>
+      </layout>
-      </item>
+     </widget>
-     </layout>
+    </item>
-    </widget>
+    <item>
-   </item>
+     <widget class="QGroupBox" name="groupBox_4">
-   <item>
+      <property name="title">
-    <widget class="QGroupBox" name="groupBox_4">
+       <string>Graphics</string>
-     <property name="title">
+      </property>
-      <string>Graphics</string>
+      <layout class="QGridLayout" name="gridLayout_3">
-     </property>
+       <item row="0" column="0">
-     <layout class="QGridLayout" name="gridLayout_3">
+        <widget class="QCheckBox" name="enable_graphics_debugging">
-      <item row="0" column="0">
+         <property name="enabled">
-       <widget class="QCheckBox" name="enable_graphics_debugging">
+          <bool>true</bool>
-        <property name="enabled">
+         </property>
-         <bool>true</bool>
+         <property name="toolTip">
-        </property>
+          <string>When checked, the graphics API enters a slower debugging mode</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, the graphics API enters a slower debugging mode</string>
+         <property name="text">
-        </property>
+          <string>Enable Graphics Debugging</string>
-        <property name="text">
+         </property>
-         <string>Enable Graphics Debugging</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item row="2" column="0">
-      </item>
+        <widget class="QCheckBox" name="enable_nsight_aftermath">
-      <item row="2" column="0">
+         <property name="toolTip">
-       <widget class="QCheckBox" name="enable_nsight_aftermath">
+          <string>When checked, it enables Nsight Aftermath crash dumps</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, it enables Nsight Aftermath crash dumps</string>
+         <property name="text">
-        </property>
+          <string>Enable Nsight Aftermath</string>
-        <property name="text">
+         </property>
-         <string>Enable Nsight Aftermath</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item row="0" column="1">
-      </item>
+        <widget class="QCheckBox" name="disable_macro_jit">
-      <item row="0" column="1">
+         <property name="enabled">
-       <widget class="QCheckBox" name="disable_macro_jit">
+          <bool>true</bool>
-        <property name="enabled">
+         </property>
-         <bool>true</bool>
+         <property name="toolTip">
-        </property>
+          <string>When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower</string>
+         <property name="text">
-        </property>
+          <string>Disable Macro JIT</string>
-        <property name="text">
+         </property>
-         <string>Disable Macro JIT</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item row="1" column="0">
-      </item>
+        <widget class="QCheckBox" name="enable_shader_feedback">
-      <item row="1" column="0">
+         <property name="toolTip">
-       <widget class="QCheckBox" name="enable_shader_feedback">
+          <string>When checked, yuzu will log statistics about the compiled pipeline cache</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, yuzu will log statistics about the compiled pipeline cache</string>
+         <property name="text">
-        </property>
+          <string>Enable Shader Feedback</string>
-        <property name="text">
+         </property>
-         <string>Enable Shader Feedback</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item row="1" column="1">
-      </item>
+        <widget class="QCheckBox" name="disable_loop_safety_checks">
-      <item row="1" column="1">
+         <property name="toolTip">
-       <widget class="QCheckBox" name="disable_loop_safety_checks">
+          <string>When checked, it executes shaders without loop logic changes</string>
-        <property name="toolTip">
+         </property>
-         <string>When checked, it executes shaders without loop logic changes</string>
+         <property name="text">
-        </property>
+          <string>Disable Loop safety checks</string>
-        <property name="text">
+         </property>
-         <string>Disable Loop safety checks</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+      </layout>
-      </item>
+     </widget>
-     </layout>
+    </item>
-    </widget>
+    <item>
-   </item>
+     <widget class="QGroupBox" name="groupBox_5">
-   <item>
+      <property name="title">
-    <widget class="QGroupBox" name="groupBox_5">
+       <string>Debugging</string>
-     <property name="title">
+      </property>
-      <string>Debugging</string>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
-     </property>
+       <item>
-     <layout class="QVBoxLayout" name="verticalLayout_7">
+        <widget class="QCheckBox" name="fs_access_log">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="fs_access_log">
+          <string>Enable FS Access Log</string>
-        <property name="text">
+         </property>
-         <string>Enable FS Access Log</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QCheckBox" name="reporting_services">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="reporting_services">
+          <string>Enable Verbose Reporting Services</string>
-        <property name="text">
+         </property>
-         <string>Enable Verbose Reporting Services</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QLabel" name="label_4">
-      <item>
+         <property name="font">
-       <widget class="QLabel" name="label_4">
+          <font>
-        <property name="font">
+           <italic>true</italic>
-         <font>
+          </font>
-          <italic>true</italic>
+         </property>
-         </font>
+         <property name="text">
-        </property>
+          <string>This will be reset automatically when yuzu closes.</string>
-        <property name="text">
+         </property>
-         <string>This will be reset automatically when yuzu closes.</string>
+         <property name="indent">
-        </property>
+          <number>20</number>
-        <property name="indent">
+         </property>
-         <number>20</number>
+        </widget>
-        </property>
+       </item>
-       </widget>
+      </layout>
-      </item>
+     </widget>
-     </layout>
+    </item>
-    </widget>
+    <item>
-   </item>
+     <widget class="QGroupBox" name="groupBox_6">
-   <item>
+      <property name="title">
-    <widget class="QGroupBox" name="groupBox_6">
+       <string>Advanced</string>
-     <property name="title">
+      </property>
-      <string>Advanced</string>
+      <layout class="QVBoxLayout" name="verticalLayout_8">
-     </property>
+       <item>
-     <layout class="QVBoxLayout" name="verticalLayout_8">
+        <widget class="QCheckBox" name="quest_flag">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="quest_flag">
+          <string>Kiosk (Quest) Mode</string>
-        <property name="text">
+         </property>
-         <string>Kiosk (Quest) Mode</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QCheckBox" name="enable_cpu_debugging">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="enable_cpu_debugging">
+          <string>Enable CPU Debugging</string>
-        <property name="text">
+         </property>
-         <string>Enable CPU Debugging</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QCheckBox" name="use_debug_asserts">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="use_debug_asserts">
+          <string>Enable Debug Asserts</string>
-        <property name="text">
+         </property>
-         <string>Enable Debug Asserts</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QCheckBox" name="use_auto_stub">
-      <item>
+         <property name="text">
-       <widget class="QCheckBox" name="use_auto_stub">
+          <string>Enable Auto-Stub</string>
-        <property name="text">
+         </property>
-         <string>Enable Auto-Stub</string>
+        </widget>
-        </property>
+       </item>
-       </widget>
+       <item>
-      </item>
+        <widget class="QLabel" name="label_5">
-      <item>
+         <property name="font">
-       <widget class="QLabel" name="label_5">
+          <font>
-        <property name="font">
+           <italic>true</italic>
-         <font>
+          </font>
-          <italic>true</italic>
+         </property>
-         </font>
+         <property name="text">
-        </property>
+          <string>This will be reset automatically when yuzu closes.</string>
-        <property name="text">
+         </property>
-         <string>This will be reset automatically when yuzu closes.</string>
+         <property name="indent">
-        </property>
+          <number>20</number>
-        <property name="indent">
+         </property>
-         <number>20</number>
+        </widget>
-        </property>
+       </item>
-       </widget>
+      </layout>
-      </item>
+     </widget>
-     </layout>
+    </item>
-    </widget>
+    <item>
-   </item>
+     <spacer name="verticalSpacer">
-   <item>
+      <property name="orientation">
-    <spacer name="verticalSpacer">
+       <enum>Qt::Vertical</enum>
-     <property name="orientation">
+      </property>
-      <enum>Qt::Vertical</enum>
+      <property name="sizeType">
-     </property>
+       <enum>QSizePolicy::Expanding</enum>
-     <property name="sizeType">
+      </property>
-      <enum>QSizePolicy::Expanding</enum>
+      <property name="sizeHint" stdset="0">
-     </property>
+       <size>
-     <property name="sizeHint" stdset="0">
+        <width>20</width>
-      <size>
+        <height>40</height>
-       <width>20</width>
+       </size>
-       <height>40</height>
+      </property>
-      </size>
+     </spacer>
-     </property>
+    </item>
-    </spacer>
+   </layout>
-   </item>
+  </widget>
-  </layout>
  </widget>
  <tabstops>
   <tabstop>log_filter_edit</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: