CommonHostInterface: Make status indicators toggleable

src/core/host_interface.cpp

@@ -560,6 +560,7 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si)
   si.SetBoolValue("Display", "ShowVPS", false);
   si.SetBoolValue("Display", "ShowSpeed", false);
   si.SetBoolValue("Display", "ShowResolution", false);
+  si.SetBoolValue("Display", "ShowStatusIndicators", false);
   si.SetBoolValue("Display", "Fullscreen", false);
   si.SetBoolValue("Display", "VSync", Settings::DEFAULT_VSYNC_VALUE);
   si.SetBoolValue("Display", "DisplayAllFrames", false);

src/core/settings.cpp

@@ -238,6 +238,7 @@ void Settings::Load(SettingsInterface& si)
   display_show_vps = si.GetBoolValue("Display", "ShowVPS", false);
   display_show_speed = si.GetBoolValue("Display", "ShowSpeed", false);
   display_show_resolution = si.GetBoolValue("Display", "ShowResolution", false);
+  display_show_status_indicators = si.GetBoolValue("Display", "ShowStatusIndicators", true);
   display_all_frames = si.GetBoolValue("Display", "DisplayAllFrames", false);
   video_sync_enabled = si.GetBoolValue("Display", "VSync", DEFAULT_VSYNC_VALUE);
   display_post_process_chain = si.GetStringValue("Display", "PostProcessChain", "");
@@ -413,6 +414,7 @@ void Settings::Save(SettingsInterface& si) const
   si.SetBoolValue("Display", "ShowVPS", display_show_vps);
   si.SetBoolValue("Display", "ShowSpeed", display_show_speed);
   si.SetBoolValue("Display", "ShowResolution", display_show_resolution);
+  si.SetBoolValue("Display", "ShowStatusIndicators", display_show_status_indicators);
   si.SetBoolValue("Display", "DisplayAllFrames", display_all_frames);
   si.SetBoolValue("Display", "VSync", video_sync_enabled);
   if (display_post_process_chain.empty())

src/core/settings.h

@@ -147,6 +147,7 @@ struct Settings
   bool display_show_vps = false;
   bool display_show_speed = false;
   bool display_show_resolution = false;
+  bool display_show_status_indicators = true;
   bool display_all_frames = false;
   bool video_sync_enabled = DEFAULT_VSYNC_VALUE;
   float display_max_fps = DEFAULT_DISPLAY_MAX_FPS;

src/duckstation-qt/advancedsettingswidget.cpp

@@ -145,7 +145,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(QtHostInterface* host_interface,
 
   addBooleanTweakOption(m_host_interface, m_ui.tweakOptionTable, tr("Disable All Enhancements"), "Main",
                         "DisableAllEnhancements", false);
-  addBooleanTweakOption(m_host_interface, m_ui.tweakOptionTable, tr("Show Fullscreen Status Indicators"), "Display",
+  addBooleanTweakOption(m_host_interface, m_ui.tweakOptionTable, tr("Show Status Indicators"), "Display",
                         "ShowStatusIndicators", true);
   addIntRangeTweakOption(m_host_interface, m_ui.tweakOptionTable, tr("Display FPS Limit"), "Display", "MaxFPS", 0, 1000,
                          0);

src/frontend-common/common_host_interface.cpp

@@ -1228,7 +1228,8 @@ void CommonHostInterface::DrawFPSWindow()
     position_y += text_size.y + spacing;                                                                               \
   } while (0)
 
-  if (System::GetState() == System::State::Running)
+  const System::State state = System::GetState();
+  if (state == System::State::Running)
   {
     const float speed = System::GetEmulationSpeed();
     if (g_settings.display_show_fps)
@@ -1267,13 +1268,21 @@ void CommonHostInterface::DrawFPSWindow()
       DRAW_LINE(IM_COL32(255, 255, 255, 255));
     }
 
-    const bool rewinding = System::IsRewinding();
+    if (g_settings.display_show_status_indicators)
-    if (rewinding || IsFastForwardEnabled() || IsTurboEnabled())
     {
-      text.Assign(rewinding ? ICON_FA_FAST_BACKWARD : ICON_FA_FAST_FORWARD);
+      const bool rewinding = System::IsRewinding();
-      DRAW_LINE(IM_COL32(255, 255, 255, 255));
+      if (rewinding || IsFastForwardEnabled() || IsTurboEnabled())
+      {
+        text.Assign(rewinding ? ICON_FA_FAST_BACKWARD : ICON_FA_FAST_FORWARD);
+        DRAW_LINE(IM_COL32(255, 255, 255, 255));
+      }
     }
   }
+  else if (g_settings.display_show_status_indicators && state == System::State::Paused)
+  {
+    text.Assign(ICON_FA_PAUSE);
+    DRAW_LINE(IM_COL32(255, 255, 255, 255));
+  }
 
 #undef DRAW_LINE
 }
@@ -3055,7 +3064,6 @@ void CommonHostInterface::SetDefaultSettings(SettingsInterface& si)
                     ControllerInterface::GetBackendName(ControllerInterface::GetDefaultBackend()));
 
   si.SetBoolValue("Display", "InternalResolutionScreenshots", false);
-  si.SetBoolValue("Display", "ShowStatusIndicators", true);
 
 #ifdef WITH_DISCORD_PRESENCE
   si.SetBoolValue("Main", "EnableDiscordPresence", false);

src/frontend-common/fullscreen_ui.cpp

@@ -113,7 +113,6 @@ static MainWindowType s_current_main_window = MainWindowType::Landing;
 static std::bitset<static_cast<u32>(FrontendCommon::ControllerNavigationButton::Count)> s_nav_input_values{};
 static bool s_debug_menu_enabled = false;
 static bool s_debug_menu_allowed = false;
-static bool s_show_status_indicators = false;
 static bool s_quick_menu_was_open = false;
 static bool s_was_paused_on_quick_menu_open = false;
 static bool s_about_window_open = false;
@@ -247,10 +246,7 @@ bool HasActiveWindow()
          ImGuiFullscreen::IsChoiceDialogOpen() || ImGuiFullscreen::IsFileSelectorOpen();
 }
 
-void LoadSettings()
+void LoadSettings() {}
-{
-  s_show_status_indicators = s_host_interface->GetBoolSettingValue("Display", "ShowStatusIndicators", true);
-}
 
 void UpdateSettings()
 {
@@ -2527,9 +2523,9 @@ void DrawSettingsWindow()
                                                       "General", "CreateSaveStateBackups", false);
 
         MenuHeading("Display Settings");
-        settings_changed |= ToggleButtonForNonSetting("Show Status Indicators",
+        settings_changed |=
-                                                      "Shows persistent icons when turbo is active or when paused.",
+          ToggleButton("Show Status Indicators", "Shows persistent icons when turbo is active or when paused.",
-                                                      "Display", "ShowStatusIndicators", true);
+                       &g_settings.display_show_status_indicators);
         settings_changed |= RangeButton(
           "Display FPS Limit", "Limits how many frames are displayed to the screen. These frames are still rendered.",
           &s_settings_copy.display_max_fps, 0.0f, 500.0f, 1.0f, "%.2f FPS");
@@ -3406,7 +3402,7 @@ void DrawStatsOverlay()
       DRAW_LINE(g_large_font, g_large_font->FontSize, 0.0f, IM_COL32(255, 255, 255, 255));
     }
 
-    if (s_show_status_indicators)
+    if (g_settings.display_show_status_indicators)
     {
       const bool rewinding = System::IsRewinding();
       if (rewinding || s_host_interface->IsFastForwardEnabled() || s_host_interface->IsTurboEnabled())
@@ -3416,7 +3412,7 @@ void DrawStatsOverlay()
       }
     }
   }
-  else if (s_show_status_indicators && state == System::State::Paused)
+  else if (g_settings.display_show_status_indicators && state == System::State::Paused)
   {
     text.Assign(ICON_FA_PAUSE);
     DRAW_LINE(g_large_font, g_large_font->FontSize * 2.0f, margin, IM_COL32(255, 255, 255, 255));