summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Kyle Kienapfel2022-09-03 04:39:28 -0700
committerGravatar Kyle Kienapfel2022-09-03 04:59:01 -0700
commitb1076859c45ba6ef732cbfa0a8ba8e6bebb0b1b5 (patch)
treeb89c8acdd40a8d3e0bf078c93da6f6ccc30cbc57 /src
parentMerge pull request #8822 from FearlessTobi/multiplayer-fixes (diff)
downloadyuzu-b1076859c45ba6ef732cbfa0a8ba8e6bebb0b1b5.tar.gz
yuzu-b1076859c45ba6ef732cbfa0a8ba8e6bebb0b1b5.tar.xz
yuzu-b1076859c45ba6ef732cbfa0a8ba8e6bebb0b1b5.zip
Qt: Make General->Debug scrollable
Configuration -> General -> Debug is getting a bit crowded. yzct12345 submit this originally, so I'm tagging them as a co-author. The original #6714 also modifies the Controls -> Player N sections, but it looks like more work is needed to make the current area scrollable. Co-authored-by: yzct12345 <87620833+yzct12345@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_debug.cpp2
-rw-r--r--src/yuzu/configuration/configure_debug.h4
-rw-r--r--src/yuzu/configuration/configure_debug.ui7
3 files changed, 9 insertions, 4 deletions
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index e16d127a8..04d397750 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -14,7 +14,7 @@
14#include "yuzu/uisettings.h" 14#include "yuzu/uisettings.h"
15 15
16ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) 16ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
17 : QWidget(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} { 17 : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} {
18 ui->setupUi(this); 18 ui->setupUi(this);
19 SetConfiguration(); 19 SetConfiguration();
20 20
diff --git a/src/yuzu/configuration/configure_debug.h b/src/yuzu/configuration/configure_debug.h
index 64d68ab8f..42d30f170 100644
--- a/src/yuzu/configuration/configure_debug.h
+++ b/src/yuzu/configuration/configure_debug.h
@@ -4,7 +4,7 @@
4#pragma once 4#pragma once
5 5
6#include <memory> 6#include <memory>
7#include <QWidget> 7#include <QScrollArea>
8 8
9namespace Core { 9namespace Core {
10class System; 10class System;
@@ -14,7 +14,7 @@ namespace Ui {
14class ConfigureDebug; 14class ConfigureDebug;
15} 15}
16 16
17class ConfigureDebug : public QWidget { 17class ConfigureDebug : public QScrollArea {
18 Q_OBJECT 18 Q_OBJECT
19 19
20public: 20public:
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui
index 4c16274fc..47b8b80f1 100644
--- a/src/yuzu/configuration/configure_debug.ui
+++ b/src/yuzu/configuration/configure_debug.ui
@@ -1,7 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<ui version="4.0"> 2<ui version="4.0">
3 <class>ConfigureDebug</class> 3 <class>ConfigureDebug</class>
4 <widget class="QWidget" name="ConfigureDebug"> 4 <widget class="QScrollArea" name="ConfigureDebug">
5 <property name="widgetResizable">
6 <bool>true</bool>
7 </property>
8 <widget class="QWidget">
5 <layout class="QVBoxLayout" name="verticalLayout_1"> 9 <layout class="QVBoxLayout" name="verticalLayout_1">
6 <item> 10 <item>
7 <layout class="QVBoxLayout" name="verticalLayout_2"> 11 <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -322,6 +326,7 @@
322 </item> 326 </item>
323 </layout> 327 </layout>
324 </widget> 328 </widget>
329 </widget>
325 <tabstops> 330 <tabstops>
326 <tabstop>log_filter_edit</tabstop> 331 <tabstop>log_filter_edit</tabstop>
327 <tabstop>toggle_console</tabstop> 332 <tabstop>toggle_console</tabstop>