ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Add option to disable status indicators 

Fast forward/pause icons.
This commit is contained in:
Connor McLaughlin 2022-02-23 21:52:18 +10:00 committed by refractionpcsx2
parent 2eaba084c7
commit 17b1c664a8
7 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
View File

@ -106,6 +106,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowCPU, "EmuCore/GS", "OsdShowCPU", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowCPU, "EmuCore/GS", "OsdShowCPU", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowResolution, "EmuCore/GS", "OsdShowResolution", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowResolution, "EmuCore/GS", "OsdShowResolution", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowGSStats, "EmuCore/GS", "OsdShowGSStats", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowGSStats, "EmuCore/GS", "OsdShowGSStats", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowIndicators, "EmuCore/GS", "OsdShowIndicators", true);
dialog->registerWidgetHelp(m_ui.osdShowMessages, tr("Show OSD Messages"), tr("Checked"), dialog->registerWidgetHelp(m_ui.osdShowMessages, tr("Show OSD Messages"), tr("Checked"),
tr("Shows on-screen-display messages when events occur such as save states being " tr("Shows on-screen-display messages when events occur such as save states being "

7
pcsx2-qt/Settings/GraphicsSettingsWidget.ui
View File

@ -919,6 +919,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QCheckBox" name="osdShowIndicators">
<property name="text">
<string>Show Indicators</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

3
pcsx2/Config.h
View File

@ -428,7 +428,8 @@ struct Pcsx2Config
OsdShowFPS : 1, OsdShowFPS : 1,
OsdShowCPU : 1, OsdShowCPU : 1,
OsdShowResolution : 1, OsdShowResolution : 1,
OsdShowGSStats : 1; OsdShowGSStats : 1,
OsdShowIndicators : 1;
bool bool
HWDisableReadbacks : 1, HWDisableReadbacks : 1,

16
pcsx2/Frontend/ImGuiManager.cpp
View File

@ -601,16 +601,22 @@ static void DrawPerformanceOverlay()
} }
} }
const bool is_normal_speed = (EmuConfig.GS.LimitScalar == EmuConfig.Framerate.NominalScalar); if (GSConfig.OsdShowIndicators)
if (!is_normal_speed)
{ {
const bool is_slowmo = (EmuConfig.GS.LimitScalar < EmuConfig.Framerate.NominalScalar); const bool is_normal_speed = (EmuConfig.GS.LimitScalar == EmuConfig.Framerate.NominalScalar);
DRAW_LINE(s_standard_font, is_slowmo ? ICON_FA_FORWARD : ICON_FA_FAST_FORWARD, IM_COL32(255, 255, 255, 255)); if (!is_normal_speed)
{
const bool is_slowmo = (EmuConfig.GS.LimitScalar < EmuConfig.Framerate.NominalScalar);
DRAW_LINE(s_standard_font, is_slowmo ? ICON_FA_FORWARD : ICON_FA_FAST_FORWARD, IM_COL32(255, 255, 255, 255));
}
} }
} }
else else
{ {
DRAW_LINE(s_standard_font, ICON_FA_PAUSE, IM_COL32(255, 255, 255, 255)); if (GSConfig.OsdShowIndicators)
{
DRAW_LINE(s_standard_font, ICON_FA_PAUSE, IM_COL32(255, 255, 255, 255));
}
} }
#undef DRAW_LINE #undef DRAW_LINE

1
pcsx2/GS/GS.cpp
View File

@ -1326,6 +1326,7 @@ void GSApp::Init()
m_default_configuration["OsdShowCPU"] = "0"; m_default_configuration["OsdShowCPU"] = "0";
m_default_configuration["OsdShowResolution"] = "0"; m_default_configuration["OsdShowResolution"] = "0";
m_default_configuration["OsdShowGSStats"] = "0"; m_default_configuration["OsdShowGSStats"] = "0";
m_default_configuration["OsdShowIndicators"] = "1";
m_default_configuration["OsdScale"] = "100"; m_default_configuration["OsdScale"] = "100";
m_default_configuration["override_geometry_shader"] = "-1"; m_default_configuration["override_geometry_shader"] = "-1";
m_default_configuration["override_GL_ARB_copy_image"] = "-1"; m_default_configuration["override_GL_ARB_copy_image"] = "-1";

1
pcsx2/GS/Window/GSwxDialog.cpp
View File

@ -519,6 +519,7 @@ OSDTab::OSDTab(wxWindow* parent)
m_ui.addCheckBox(log_grid, "Show CPU Usage", "OsdShowCPU", -1); m_ui.addCheckBox(log_grid, "Show CPU Usage", "OsdShowCPU", -1);
m_ui.addCheckBox(log_grid, "Show Resolution", "OsdShowResolution", -1); m_ui.addCheckBox(log_grid, "Show Resolution", "OsdShowResolution", -1);
m_ui.addCheckBox(log_grid, "Show Statistics", "OsdShowGSStats", -1); m_ui.addCheckBox(log_grid, "Show Statistics", "OsdShowGSStats", -1);
m_ui.addCheckBox(log_grid, "Show Indicators", "OsdShowIndicators", -1);
log_box->Add(log_grid, wxSizerFlags().Expand()); log_box->Add(log_grid, wxSizerFlags().Expand());
tab_box->Add(log_box.outer, wxSizerFlags().Expand()); tab_box->Add(log_box.outer, wxSizerFlags().Expand());

2
pcsx2/Pcsx2Config.cpp
View File

@ -289,6 +289,7 @@ Pcsx2Config::GSOptions::GSOptions()
OsdShowCPU = false; OsdShowCPU = false;
OsdShowResolution = false; OsdShowResolution = false;
OsdShowGSStats = false; OsdShowGSStats = false;
OsdShowIndicators = true;
HWDisableReadbacks = false; HWDisableReadbacks = false;
AccurateDATE = true; AccurateDATE = true;
@ -483,6 +484,7 @@ void Pcsx2Config::GSOptions::ReloadIniSettings()
GSSettingBool(OsdShowCPU); GSSettingBool(OsdShowCPU);
GSSettingBool(OsdShowResolution); GSSettingBool(OsdShowResolution);
GSSettingBool(OsdShowGSStats); GSSettingBool(OsdShowGSStats);
GSSettingBool(OsdShowIndicators);
GSSettingBool(HWDisableReadbacks); GSSettingBool(HWDisableReadbacks);
GSSettingBoolEx(AccurateDATE, "accurate_date"); GSSettingBoolEx(AccurateDATE, "accurate_date");