From 89b2d3d3ce4e91b4d09f1ddfde714f7553754abe Mon Sep 17 00:00:00 2001 From: Kleidis <167202775+kleidis@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:22:24 +0100 Subject: [PATCH] Move `turbo_speed_slider` from UISettings to CommonSettings Also rename to just `turbo_speed` --- src/citra_qt/citra_qt.cpp | 8 ++++---- src/citra_qt/configuration/config.cpp | 4 ++-- src/citra_qt/configuration/configure_general.cpp | 14 +++++++------- src/citra_qt/configuration/configure_general.ui | 2 +- src/citra_qt/uisettings.h | 1 - src/common/settings.h | 3 ++- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 180f6ca68..1ab16bdf7 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -2563,7 +2563,7 @@ void GMainWindow::ToggleEmulationSpeed() { turbo_mode_active = !turbo_mode_active; if (turbo_mode_active) { - Settings::values.frame_limit.SetValue(UISettings::values.turbo_speed_slider.GetValue()); + Settings::values.frame_limit.SetValue(Settings::values.turbo_speed.GetValue()); } else { Settings::values.frame_limit.SetValue(initial_frame_limit); } @@ -2579,16 +2579,16 @@ void GMainWindow::AdjustSpeedLimit(bool increase) { } const int SPEED_LIMIT_STEP = 5; - int turbo_speed = UISettings::values.turbo_speed_slider.GetValue(); + int turbo_speed = Settings::values.turbo_speed.GetValue(); if (increase) { if (turbo_speed < 995) { - UISettings::values.turbo_speed_slider.SetValue(turbo_speed + SPEED_LIMIT_STEP); + Settings::values.turbo_speed.SetValue(turbo_speed + SPEED_LIMIT_STEP); Settings::values.frame_limit.SetValue(turbo_speed + SPEED_LIMIT_STEP); } } else { if (turbo_speed > SPEED_LIMIT_STEP) { - UISettings::values.turbo_speed_slider.SetValue(turbo_speed - SPEED_LIMIT_STEP); + Settings::values.turbo_speed.SetValue(turbo_speed - SPEED_LIMIT_STEP); Settings::values.frame_limit.SetValue(turbo_speed - SPEED_LIMIT_STEP); } } diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index d2aa2c697..874ddc35c 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -807,7 +807,7 @@ void QtConfig::ReadUIValues() { ReadBasicSetting(UISettings::values.display_titlebar); ReadBasicSetting(UISettings::values.show_filter_bar); ReadBasicSetting(UISettings::values.show_status_bar); - ReadBasicSetting(UISettings::values.turbo_speed_slider); + ReadBasicSetting(Settings::values.turbo_speed); ReadBasicSetting(UISettings::values.confirm_before_closing); ReadBasicSetting(UISettings::values.save_state_warning); ReadBasicSetting(UISettings::values.first_start); @@ -1324,7 +1324,7 @@ void QtConfig::SaveUIValues() { WriteBasicSetting(UISettings::values.show_filter_bar); WriteBasicSetting(UISettings::values.show_status_bar); WriteBasicSetting(UISettings::values.confirm_before_closing); - WriteBasicSetting(UISettings::values.turbo_speed_slider); + WriteBasicSetting(Settings::values.turbo_speed); WriteBasicSetting(UISettings::values.save_state_warning); WriteBasicSetting(UISettings::values.first_start); WriteBasicSetting(UISettings::values.callout_flags); diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index 746b4b167..cc863f6e5 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -28,10 +28,10 @@ ConfigureGeneral::ConfigureGeneral(bool is_powered_on, QWidget* parent) : QWidget(parent), ui(std::make_unique()), is_powered_on{is_powered_on} { ui->setupUi(this); - connect(ui->turbo_speed_slider, &QSlider::valueChanged, this, [&](int value) { - UISettings::values.turbo_speed_slider.SetValue(SliderToSettings(value)); + connect(ui->turbo_speed, &QSlider::valueChanged, this, [&](int value) { + Settings::values.turbo_speed.SetValue(SliderToSettings(value)); ui->turbo_speed_display_label->setText( - QStringLiteral("%1%").arg(UISettings::values.turbo_speed_slider.GetValue())); + QStringLiteral("%1%").arg(Settings::values.turbo_speed.GetValue())); }); // Set a minimum width for the label to prevent the slider from changing size. @@ -76,10 +76,10 @@ ConfigureGeneral::~ConfigureGeneral() = default; void ConfigureGeneral::SetConfiguration() { if (Settings::IsConfiguringGlobal()) { - ui->turbo_speed_slider->setValue( - SettingsToSlider(UISettings::values.turbo_speed_slider.GetValue())); + ui->turbo_speed->setValue( + SettingsToSlider(Settings::values.turbo_speed.GetValue())); ui->turbo_speed_display_label->setText( - QStringLiteral("%1%").arg(UISettings::values.turbo_speed_slider.GetValue())); + QStringLiteral("%1%").arg(Settings::values.turbo_speed.GetValue())); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); ui->toggle_background_pause->setChecked( @@ -227,7 +227,7 @@ void ConfigureGeneral::SetupPerGameUI() { ConfigurationShared::SetHighlight(ui->widget_screenshot, index == 1); }); - ui->turbo_speed_slider->setVisible(false); + ui->turbo_speed->setVisible(false); ui->general_group->setVisible(false); ui->updateBox->setVisible(false); ui->button_reset_defaults->setVisible(false); diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui index f6531af6c..e2ecc4aff 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/citra_qt/configuration/configure_general.ui @@ -255,7 +255,7 @@ - + 0 diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h index 9c833b936..48ffa528d 100644 --- a/src/citra_qt/uisettings.h +++ b/src/citra_qt/uisettings.h @@ -76,7 +76,6 @@ struct Values { Settings::Setting show_filter_bar{true, "showFilterBar"}; Settings::Setting show_status_bar{true, "showStatusBar"}; - Settings::Setting turbo_speed_slider{200, "turboSpeedSlider"}; Settings::Setting confirm_before_closing{true, "confirmClose"}; Settings::Setting save_state_warning{true, "saveStateWarning"}; Settings::Setting first_start{true, "firstStart"}; diff --git a/src/common/settings.h b/src/common/settings.h index f8e9e3e2e..c52afee7f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -494,7 +494,8 @@ struct Values { Setting use_shader_jit{true, "use_shader_jit"}; SwitchableSetting resolution_factor{1, 0, 10, "resolution_factor"}; SwitchableSetting frame_limit{100, 0, 1000, "frame_limit"}; - SwitchableSetting texture_filter{TextureFilter::NoFilter, "texture_filter"}; + SwitchableSetting turbo_speed{200, 0, 1000, "turbo_speed"}; + SwitchableSetting texture_filter{TextureFilter::None, "texture_filter"}; SwitchableSetting texture_sampling{TextureSampling::GameControlled, "texture_sampling"}; SwitchableSetting delay_game_render_thread_us{0, 0, 16000,