From b1076859c45ba6ef732cbfa0a8ba8e6bebb0b1b5 Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel Date: Sat, 3 Sep 2022 04:39:28 -0700 Subject: [PATCH] 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> --- src/yuzu/configuration/configure_debug.cpp | 2 +- src/yuzu/configuration/configure_debug.h | 4 ++-- src/yuzu/configuration/configure_debug.ui | 7 ++++++- 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 @@ #include "yuzu/uisettings.h" ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) - : QWidget(parent), ui{std::make_unique()}, system{system_} { + : QScrollArea(parent), ui{std::make_unique()}, system{system_} { ui->setupUi(this); SetConfiguration(); 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 @@ #pragma once #include -#include +#include namespace Core { class System; @@ -14,7 +14,7 @@ namespace Ui { class ConfigureDebug; } -class ConfigureDebug : public QWidget { +class ConfigureDebug : public QScrollArea { Q_OBJECT public: 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 @@ ConfigureDebug - + + + true + + @@ -322,6 +326,7 @@ + log_filter_edit toggle_console