Rewrite to keep only a single QSpinBox

* Second rewrite

* set Unthrottled to 0 in the Qspinbox

* Hotkey for Unthrottle

src/citra/config.cpp

@@ -123,7 +123,7 @@ void Config::ReadValues() {
     Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true);
     Settings::values.resolution_factor =
         static_cast<u16>(sdl2_config->GetInteger("Renderer", "resolution_factor", 1));
-    Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true);
+    Settings::values.unthrottled = sdl2_config->GetBoolean("Renderer", "unthrottled", false);
     Settings::values.use_disk_shader_cache =
         sdl2_config->GetBoolean("Renderer", "use_disk_shader_cache", true);
     Settings::values.frame_limit =

src/citra/default_ini.h

@@ -135,16 +135,17 @@ resolution_factor =
 # Texture filter name
 texture_filter_name =
 
-# Turns on the frame limiter, which will limit frames output to the target game speed
-# 0: Off, 1: On (default)
-use_frame_limit =
+# Turns off the frame limiter, which will make the game speed go as high as it can.
+# 0: Off (default), 1: On
+unthrottled =
 
-# Limits the speed of the game to run no faster than this value as a percentage of target speed
+# Limits the speed of the game to run no faster than this value as a percentage of target speed.
+# Will not have an effect if unthrottled is enabled.
 # 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)
 frame_limit =
 
-# Overrides the frame limiter to use frame_limit_alternate instead of frame_limit. Will only have
-# an effect if use_frame_limit is enabled
+# Overrides the frame limiter to use frame_limit_alternate instead of frame_limit. Will not have an
+# effect if unthrottled is enabled.
 # 0: Off (default), 1: On
 use_frame_limit_alternate =
 

src/citra_qt/configuration/config.cpp

@@ -78,7 +78,7 @@ const std::array<UISettings::Shortcut, 24> default_hotkeys{
      {QStringLiteral("Toggle Filter Bar"),        QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F"), Qt::WindowShortcut}},
      {QStringLiteral("Toggle Frame Advancing"),   QStringLiteral("Main Window"), {QStringLiteral("Ctrl+A"), Qt::ApplicationShortcut}},
      {QStringLiteral("Toggle Screen Layout"),     QStringLiteral("Main Window"), {QStringLiteral("F10"), Qt::WindowShortcut}},
-     {QStringLiteral("Toggle Speed Limit"),       QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Z"), Qt::ApplicationShortcut}},
+     {QStringLiteral("Unthrottle"),               QStringLiteral("Main Window"), {QStringLiteral("Tab"), Qt::ApplicationShortcut}},
      {QStringLiteral("Toggle Alternate Speed"),   QStringLiteral("Main Window"), {QStringLiteral("Ctrl+X"), Qt::ApplicationShortcut}},
      {QStringLiteral("Toggle Status Bar"),        QStringLiteral("Main Window"), {QStringLiteral("Ctrl+S"), Qt::WindowShortcut}},
      {QStringLiteral("Toggle Texture Dumping"),   QStringLiteral("Main Window"), {QStringLiteral("Ctrl+D"), Qt::ApplicationShortcut}}}};
@@ -446,8 +446,7 @@ void Config::ReadRendererValues() {
     Settings::values.use_vsync_new = ReadSetting(QStringLiteral("use_vsync_new"), true).toBool();
     Settings::values.resolution_factor =
         static_cast<u16>(ReadSetting(QStringLiteral("resolution_factor"), 1).toInt());
-    Settings::values.use_frame_limit =
-        ReadSetting(QStringLiteral("use_frame_limit"), true).toBool();
+    Settings::values.unthrottled = ReadSetting(QStringLiteral("unthrottled"), false).toBool();
     Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt();
     Settings::values.use_frame_limit_alternate =
         ReadSetting(QStringLiteral("use_frame_limit_alternate"), false).toBool();
@@ -934,7 +933,7 @@ void Config::SaveRendererValues() {
     WriteSetting(QStringLiteral("use_shader_jit"), Settings::values.use_shader_jit, true);
     WriteSetting(QStringLiteral("use_vsync_new"), Settings::values.use_vsync_new, true);
     WriteSetting(QStringLiteral("resolution_factor"), Settings::values.resolution_factor, 1);
-    WriteSetting(QStringLiteral("use_frame_limit"), Settings::values.use_frame_limit, true);
+    WriteSetting(QStringLiteral("unthrottled"), Settings::values.unthrottled, false);
     WriteSetting(QStringLiteral("frame_limit"), Settings::values.frame_limit, 100);
     WriteSetting(QStringLiteral("use_frame_limit_alternate"),
                  Settings::values.use_frame_limit_alternate, false);

src/citra_qt/configuration/configure_general.cpp

@@ -15,11 +15,6 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
     ui->setupUi(this);
     SetConfiguration();
 
-    connect(ui->toggle_frame_limit, &QCheckBox::toggled, ui->frame_limit, &QSpinBox::setEnabled);
-    
-    connect(ui->toggle_alternate_speed, &QCheckBox::toggled, ui->frame_limit_alternate,
-            &QSpinBox::setEnabled);
-
     ui->updateBox->setVisible(UISettings::values.updater_found);
     connect(ui->button_reset_defaults, &QPushButton::clicked, this,
             &ConfigureGeneral::ResetDefaults);
@@ -38,14 +33,14 @@ void ConfigureGeneral::SetConfiguration() {
     // The first item is "auto-select" with actual value -1, so plus one here will do the trick
     ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1);
 
-    ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit);
-    ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked());
-    ui->frame_limit->setValue(Settings::values.frame_limit);
-
     ui->toggle_alternate_speed->setChecked(Settings::values.use_frame_limit_alternate);
-    ui->frame_limit_alternate->setEnabled(ui->toggle_alternate_speed->isChecked());
-    ui->frame_limit_alternate->setValue(Settings::values.frame_limit_alternate);
+    if (Settings::values.unthrottled) {
+        ui->frame_limit_alternate->setValue(0);
+    } else {
+        ui->frame_limit_alternate->setValue(Settings::values.frame_limit_alternate);
+    }
 }
+    
 
 void ConfigureGeneral::ResetDefaults() {
     QMessageBox::StandardButton answer = QMessageBox::question(
@@ -70,11 +65,15 @@ void ConfigureGeneral::ApplyConfiguration() {
 
     Settings::values.region_value = ui->region_combobox->currentIndex() - 1;
 
-    Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked();
-    Settings::values.frame_limit = ui->frame_limit->value();
-
     Settings::values.use_frame_limit_alternate = ui->toggle_alternate_speed->isChecked();
-    Settings::values.frame_limit_alternate = ui->frame_limit_alternate->value();
+    if (!ui->toggle_alternate_speed->isChecked()) {
+        if (ui->frame_limit_alternate->value() == 0)
+            Settings::values.unthrottled = true;
+    } else {
+        Settings::values.unthrottled = false;
+        if (!ui->frame_limit_alternate->value() == 0)
+            Settings::values.frame_limit_alternate = ui->frame_limit_alternate->value();
+    }
 }
 
 void ConfigureGeneral::RetranslateUI() {

src/citra_qt/configuration/configure_general.ui

@@ -76,16 +76,9 @@
        </property>
        <layout class="QGridLayout" name="gridLayout">
         <item row="1" column="0">
-         <widget class="QCheckBox" name="toggle_frame_limit">
-          <property name="text">
-           <string>Limit Speed Percent</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
          <widget class="QCheckBox" name="toggle_alternate_speed">
           <property name="text">
-           <string>Alternate Speed Limit</string>
+           <string>Alternate Speed Percent</string>
           </property>
          </widget>
         </item>
@@ -141,28 +134,12 @@
          </widget>
         </item>
         <item row="1" column="1">
-         <widget class="QSpinBox" name="frame_limit">
-          <property name="suffix">
-           <string>%</string>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>9999</number>
-          </property>
-          <property name="value">
-           <number>100</number>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
          <widget class="QSpinBox" name="frame_limit_alternate">
           <property name="suffix">
            <string>%</string>
           </property>
           <property name="minimum">
-           <number>1</number>
+           <number>0</number>
           </property>
           <property name="maximum">
            <number>9999</number>
@@ -170,6 +147,12 @@
           <property name="value">
            <number>200</number>
           </property>
+          <property name="singleStep">
+           <number>5</number>
+          </property>
+          <property name="specialValueText">
+           <string>Unthrottled</string>
+          </property>
          </widget>
         </item>
        </layout>

src/citra_qt/main.cpp

@@ -491,9 +491,9 @@ void GMainWindow::InitializeHotkeys() {
                     ToggleFullscreen();
                 }
             });
-    connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Toggle Speed Limit"), this),
+    connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Unthrottle"), this),
             &QShortcut::activated, this, [&] {
-                Settings::values.use_frame_limit = !Settings::values.use_frame_limit;
+                Settings::values.unthrottled = !Settings::values.unthrottled;
                 UpdateStatusBar();
             });
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Toggle Alternate Speed"), this),
@@ -510,30 +510,16 @@ void GMainWindow::InitializeHotkeys() {
     static constexpr u16 SPEED_LIMIT_STEP = 5;
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Increase Speed Limit"), this),
             &QShortcut::activated, this, [&] {
-                if (Settings::values.use_frame_limit_alternate) {
-                    if (Settings::values.frame_limit_alternate < 9999 - SPEED_LIMIT_STEP) {
-                        Settings::values.frame_limit_alternate += SPEED_LIMIT_STEP;
-                        UpdateStatusBar();
-                    }
-                } else {
-                    if (Settings::values.frame_limit < 9999 - SPEED_LIMIT_STEP) {
-                        Settings::values.frame_limit += SPEED_LIMIT_STEP;
-                        UpdateStatusBar();
-                    }
+                if (Settings::values.frame_limit_alternate < 9999 - SPEED_LIMIT_STEP) {
+                    Settings::values.frame_limit_alternate += SPEED_LIMIT_STEP;
+                    UpdateStatusBar();
                 }
             });
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Decrease Speed Limit"), this),
             &QShortcut::activated, this, [&] {
-                if (Settings::values.use_frame_limit_alternate) {
-                    if (Settings::values.frame_limit_alternate > SPEED_LIMIT_STEP) {
-                        Settings::values.frame_limit_alternate -= SPEED_LIMIT_STEP;
-                        UpdateStatusBar();
-                    }
-                } else {
-                    if (Settings::values.frame_limit > SPEED_LIMIT_STEP) {
-                        Settings::values.frame_limit -= SPEED_LIMIT_STEP;
-                        UpdateStatusBar();
-                    }
+                if (Settings::values.frame_limit_alternate > SPEED_LIMIT_STEP) {
+                    Settings::values.frame_limit_alternate -= SPEED_LIMIT_STEP;
+                    UpdateStatusBar();
                 }
             });
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Toggle Frame Advancing"), this),
@@ -2041,7 +2027,7 @@ void GMainWindow::UpdateStatusBar() {
 
     auto results = Core::System::GetInstance().GetAndResetPerfStats();
 
-    if (Settings::values.use_frame_limit) {
+    if (!Settings::values.unthrottled) {
         if (Settings::values.use_frame_limit_alternate)
         {
             emu_speed_label->setText(tr("Speed: %1% / %2%")

src/core/perf_stats.cpp

@@ -133,7 +133,7 @@ void FrameLimiter::DoFrameLimiting(microseconds current_system_time_us) {
         return;
     }
 
-    if (!Settings::values.use_frame_limit) {
+    if (Settings::values.unthrottled) {
         return;
     }
 

src/core/settings.cpp

@@ -81,7 +81,7 @@ void LogSettings() {
     LogSetting("Renderer_ShadersAccurateMul", Settings::values.shaders_accurate_mul);
     LogSetting("Renderer_UseShaderJit", Settings::values.use_shader_jit);
     LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
-    LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
+    LogSetting("Renderer_Unthrottled", Settings::values.unthrottled);
     LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
     LogSetting("Renderer_UseFrameLimitAlternate", Settings::values.use_frame_limit_alternate);
     LogSetting("Renderer_FrameLimitAlternate", Settings::values.frame_limit_alternate);

src/core/settings.h

@@ -146,7 +146,7 @@ struct Values {
     bool shaders_accurate_mul;
     bool use_shader_jit;
     u16 resolution_factor;
-    bool use_frame_limit;
+    bool unthrottled;
     bool use_frame_limit_alternate;
     u16 frame_limit;
     u16 frame_limit_alternate;

src/core/telemetry_session.cpp

@@ -165,8 +165,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader) {
     AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.use_cpu_jit);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
              Settings::values.resolution_factor);
-    AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimit",
-             Settings::values.use_frame_limit);
+    AddField(Telemetry::FieldType::UserConfig, "Renderer_Unthrottled",
+             Settings::values.unthrottled);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_FrameLimit", Settings::values.frame_limit);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_UseFrameLimitAlternate",
              Settings::values.use_frame_limit_alternate);