emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-13 09:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move turbo_speed_slider from UISettings to CommonSettings

Browse Source 
Also rename to just `turbo_speed`
This commit is contained in:
Kleidis 2024-11-13 17:22:24 +01:00 committed by OpenSauce04
parent 86432c8fc1
commit 89b2d3d3ce
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/citra_qt/citra_qt.cpp
View File

@ -2563,7 +2563,7 @@ void GMainWindow::ToggleEmulationSpeed() {
turbo_mode_active = !turbo_mode_active; turbo_mode_active = !turbo_mode_active;
if (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 { } else {
Settings::values.frame_limit.SetValue(initial_frame_limit); Settings::values.frame_limit.SetValue(initial_frame_limit);
} }
@ -2579,16 +2579,16 @@ void GMainWindow::AdjustSpeedLimit(bool increase) {
} }
const int SPEED_LIMIT_STEP = 5; 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 (increase) {
if (turbo_speed < 995) { 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); Settings::values.frame_limit.SetValue(turbo_speed + SPEED_LIMIT_STEP);
} }
} else { } else {
if (turbo_speed > SPEED_LIMIT_STEP) { 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); Settings::values.frame_limit.SetValue(turbo_speed - SPEED_LIMIT_STEP);
} }
} }

4
src/citra_qt/configuration/config.cpp
View File

@ -807,7 +807,7 @@ void QtConfig::ReadUIValues() {
ReadBasicSetting(UISettings::values.display_titlebar); ReadBasicSetting(UISettings::values.display_titlebar);
ReadBasicSetting(UISettings::values.show_filter_bar); ReadBasicSetting(UISettings::values.show_filter_bar);
ReadBasicSetting(UISettings::values.show_status_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.confirm_before_closing);
ReadBasicSetting(UISettings::values.save_state_warning); ReadBasicSetting(UISettings::values.save_state_warning);
ReadBasicSetting(UISettings::values.first_start); ReadBasicSetting(UISettings::values.first_start);
@ -1324,7 +1324,7 @@ void QtConfig::SaveUIValues() {
WriteBasicSetting(UISettings::values.show_filter_bar); WriteBasicSetting(UISettings::values.show_filter_bar);
WriteBasicSetting(UISettings::values.show_status_bar); WriteBasicSetting(UISettings::values.show_status_bar);
WriteBasicSetting(UISettings::values.confirm_before_closing); 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.save_state_warning);
WriteBasicSetting(UISettings::values.first_start); WriteBasicSetting(UISettings::values.first_start);
WriteBasicSetting(UISettings::values.callout_flags); WriteBasicSetting(UISettings::values.callout_flags);

14
src/citra_qt/configuration/configure_general.cpp
View File

@ -28,10 +28,10 @@ ConfigureGeneral::ConfigureGeneral(bool is_powered_on, QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureGeneral>()), is_powered_on{is_powered_on} { : QWidget(parent), ui(std::make_unique<Ui::ConfigureGeneral>()), is_powered_on{is_powered_on} {
ui->setupUi(this); ui->setupUi(this);
connect(ui->turbo_speed_slider, &QSlider::valueChanged, this, [&](int value) { connect(ui->turbo_speed, &QSlider::valueChanged, this, [&](int value) {
UISettings::values.turbo_speed_slider.SetValue(SliderToSettings(value)); Settings::values.turbo_speed.SetValue(SliderToSettings(value));
ui->turbo_speed_display_label->setText( 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. // Set a minimum width for the label to prevent the slider from changing size.
@ -76,10 +76,10 @@ ConfigureGeneral::~ConfigureGeneral() = default;
void ConfigureGeneral::SetConfiguration() { void ConfigureGeneral::SetConfiguration() {
if (Settings::IsConfiguringGlobal()) { if (Settings::IsConfiguringGlobal()) {
ui->turbo_speed_slider->setValue( ui->turbo_speed->setValue(
SettingsToSlider(UISettings::values.turbo_speed_slider.GetValue())); SettingsToSlider(Settings::values.turbo_speed.GetValue()));
ui->turbo_speed_display_label->setText( 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_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue());
ui->toggle_background_pause->setChecked( ui->toggle_background_pause->setChecked(
@ -227,7 +227,7 @@ void ConfigureGeneral::SetupPerGameUI() {
ConfigurationShared::SetHighlight(ui->widget_screenshot, index == 1); ConfigurationShared::SetHighlight(ui->widget_screenshot, index == 1);
}); });
ui->turbo_speed_slider->setVisible(false); ui->turbo_speed->setVisible(false);
ui->general_group->setVisible(false); ui->general_group->setVisible(false);
ui->updateBox->setVisible(false); ui->updateBox->setVisible(false);
ui->button_reset_defaults->setVisible(false); ui->button_reset_defaults->setVisible(false);

2
src/citra_qt/configuration/configure_general.ui
View File

@ -255,7 +255,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSlider" name="turbo_speed_slider"> <widget class="QSlider" name="turbo_speed">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
</property> </property>

1
src/citra_qt/uisettings.h
View File

@ -76,7 +76,6 @@ struct Values {
Settings::Setting<bool> show_filter_bar{true, "showFilterBar"}; Settings::Setting<bool> show_filter_bar{true, "showFilterBar"};
Settings::Setting<bool> show_status_bar{true, "showStatusBar"}; Settings::Setting<bool> show_status_bar{true, "showStatusBar"};
Settings::Setting<int> turbo_speed_slider{200, "turboSpeedSlider"};
Settings::Setting<bool> confirm_before_closing{true, "confirmClose"}; Settings::Setting<bool> confirm_before_closing{true, "confirmClose"};
Settings::Setting<bool> save_state_warning{true, "saveStateWarning"}; Settings::Setting<bool> save_state_warning{true, "saveStateWarning"};
Settings::Setting<bool> first_start{true, "firstStart"}; Settings::Setting<bool> first_start{true, "firstStart"};

3
src/common/settings.h
View File

@ -494,7 +494,8 @@ struct Values {
Setting<bool> use_shader_jit{true, "use_shader_jit"}; Setting<bool> use_shader_jit{true, "use_shader_jit"};
SwitchableSetting<u32, true> resolution_factor{1, 0, 10, "resolution_factor"}; SwitchableSetting<u32, true> resolution_factor{1, 0, 10, "resolution_factor"};
SwitchableSetting<double, true> frame_limit{100, 0, 1000, "frame_limit"}; SwitchableSetting<double, true> frame_limit{100, 0, 1000, "frame_limit"};
SwitchableSetting<TextureFilter> texture_filter{TextureFilter::NoFilter, "texture_filter"}; SwitchableSetting<int, true> turbo_speed{200, 0, 1000, "turbo_speed"};
SwitchableSetting<TextureFilter> texture_filter{TextureFilter::None, "texture_filter"};
SwitchableSetting<TextureSampling> texture_sampling{TextureSampling::GameControlled, SwitchableSetting<TextureSampling> texture_sampling{TextureSampling::GameControlled,
"texture_sampling"}; "texture_sampling"};
SwitchableSetting<u16, true> delay_game_render_thread_us{0, 0, 16000, SwitchableSetting<u16, true> delay_game_render_thread_us{0, 0, 16000,