Browse Source

Merge pull request 'Fix Qt <6.7 build and allow speed limit to be saved' (#52) from crueter/eden:fix-limit-speed into master

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/52
nce_cpp
CamilleLaVey 8 months ago
parent
commit
fa950aaeca
  1. 2
      src/common/settings.h
  2. 2
      src/yuzu/configuration/configure_input.cpp
  3. 1
      src/yuzu/configuration/shared_widget.cpp
  4. 1
      src/yuzu/game_list.cpp
  5. 834
      src/yuzu/main.cpp

2
src/common/settings.h

@ -201,7 +201,7 @@ struct Values {
"memory_layout_mode",
Category::Core};
SwitchableSetting<bool> 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<u16, true> speed_limit{linkage,
100,
0,

2
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);
});

1
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);

1
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);

834
src/yuzu/main.cpp
File diff suppressed because it is too large
View File

Loading…
Cancel
Save