From 2de35b47a68ddb35cd3539eab45a28ffeff1d347 Mon Sep 17 00:00:00 2001 From: swurl Date: Wed, 23 Apr 2025 18:36:39 -0400 Subject: [PATCH] Fix Qt <6.7 build and allow speed limit to be saved Signed-off-by: swurl --- src/common/settings.h | 2 +- src/yuzu/configuration/configure_input.cpp | 2 +- src/yuzu/configuration/shared_widget.cpp | 1 + src/yuzu/game_list.cpp | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index c2cdeb4994..2010066444 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -201,7 +201,7 @@ struct Values { "memory_layout_mode", Category::Core}; SwitchableSetting use_speed_limit{ - linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, false, true}; + linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, true, true}; SwitchableSetting speed_limit{linkage, 100, 0, diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 0343595604..28c3baf086 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -121,7 +121,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, &ConfigureInput::UpdateAllInputDevices); connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this, &ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection); - connect(connected_controller_checkboxes[i], &QCheckBox::checkStateChanged, [this, i](int state) { + connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) { // Keep activated controllers synced with the "Connected Controllers" checkboxes player_controllers[i]->ConnectPlayer(state == Qt::Checked); }); diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index 85f4f76550..688f2ec9b6 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -759,6 +759,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati if (setting.Switchable() && Settings::IsConfiguringGlobal() && !runtime_lock) { enable &= setting.UsingGlobal(); } + this->setEnabled(enable); this->setToolTip(tooltip); diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index a419fa4f08..ed0ffb7efc 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -335,6 +335,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid tree_view->setSortingEnabled(true); tree_view->setEditTriggers(QHeaderView::NoEditTriggers); tree_view->setContextMenuPolicy(Qt::CustomContextMenu); + tree_view->setAttribute(Qt::WA_AcceptTouchEvents, true); tree_view->setStyleSheet(QStringLiteral("QTreeView{ border: none; }")); item_model->insertColumns(0, COLUMN_COUNT);