From 81a96bafe210c218efed4e3f1138510bb8a0748c Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:41:25 -0400 Subject: [PATCH] configuration: Move speed_limit to core --- src/yuzu/configuration/configure_graphics.cpp | 6 ------ src/yuzu/configuration/configure_system.cpp | 6 ++++++ src/yuzu/configuration/shared_translation.cpp | 6 ++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 5537118ef..2f041cba6 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -250,12 +250,6 @@ void ConfigureGraphics::Setup() { setting, translations, combobox_translations, this, runtime_lock, apply_funcs, ConfigurationShared::RequestType::ReverseSlider, true, 0.5f, nullptr, tr("%1%", "FSR sharpening percentage (e.g. 50%)")); - } else if (setting->Id() == Settings::values.speed_limit.Id()) { - // speed_limit needs a checkbox to set use_speed_limit, as well as a spinbox - return new ConfigurationShared::Widget( - setting, translations, combobox_translations, this, runtime_lock, apply_funcs, - &Settings::values.use_speed_limit, ConfigurationShared::RequestType::SpinBox, - tr("%", "Limit speed percentage (e.g. 50%)")); } else { return new ConfigurationShared::Widget(setting, translations, combobox_translations, this, runtime_lock, apply_funcs); diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 51b0629a6..6a985c515 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -142,6 +142,12 @@ void ConfigureSystem::Setup() { return new ConfigurationShared::Widget( setting, translations, combobox_translations, this, runtime_lock, apply_funcs, &Settings::values.rng_seed_enabled, ConfigurationShared::RequestType::HexEdit); + } else if (setting->Id() == Settings::values.speed_limit.Id()) { + // speed_limit needs a checkbox to set use_speed_limit, as well as a spinbox + return new ConfigurationShared::Widget( + setting, translations, combobox_translations, this, runtime_lock, apply_funcs, + &Settings::values.use_speed_limit, ConfigurationShared::RequestType::SpinBox, + tr("%", "Limit speed percentage (e.g. 50%)")); } else { return new ConfigurationShared::Widget(setting, translations, combobox_translations, this, runtime_lock, apply_funcs); diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index fa9683b21..ec4bddb26 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp @@ -36,6 +36,8 @@ std::unique_ptr InitializeTranslations(QWidget* parent) { INSERT(Settings, use_multi_core, "Multicore CPU Emulation", ""); INSERT(Settings, use_unsafe_extended_memory_layout, "Unsafe extended memory layout (8GB DRAM)", ""); + INSERT(Settings, use_speed_limit, "", ""); + INSERT(Settings, speed_limit, "Limit Speed Percent", ""); // Cpu INSERT(Settings, cpu_accuracy, "Accuracy:", ""); @@ -120,10 +122,6 @@ std::unique_ptr InitializeTranslations(QWidget* parent) { // Renderer (Debug) - // Renderer (General) - INSERT(Settings, use_speed_limit, "", ""); - INSERT(Settings, speed_limit, "Limit Speed Percent", ""); - // System INSERT(Settings, rng_seed, "RNG Seed", ""); INSERT(Settings, rng_seed_enabled, "", "");