Skip to content

Commit e056654

Browse files
bslenullightningterror
authored andcommitted
OSD: Include "Show GPU Debug Info" when using the "De/Select All" buttons
1 parent 6c4a8ef commit e056654

2 files changed

Lines changed: 18 additions & 29 deletions

File tree

pcsx2-qt/Settings/OSDSettingsWidget.cpp

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ OSDSettingsWidget::OSDSettingsWidget(SettingsWindow* settings_dialog, QWidget* p
7777

7878
#ifndef _WIN32
7979
// Currently DX12 only
80-
m_ui.showDebugGPU->deleteLater();
80+
m_ui.showDebugGPU->setVisible(false);
8181
#endif
8282

8383
connect(m_ui.showSettings, &QCheckBox::checkStateChanged, this, &OSDSettingsWidget::onOsdShowSettingsToggled);
@@ -255,33 +255,7 @@ void OSDSettingsWidget::onOsdShowSettingsToggled()
255255
m_ui.showPatches->setEnabled(enabled);
256256
}
257257

258-
void OSDSettingsWidget::onSelectAllClicked()
259-
{
260-
const QList<QCheckBox*> checkboxes = {
261-
m_ui.showSpeedPercentages,
262-
m_ui.showFPS,
263-
m_ui.showVPS,
264-
m_ui.showResolution,
265-
m_ui.showGSStats,
266-
m_ui.showUsageCPU,
267-
m_ui.showUsageGPU,
268-
m_ui.showStatusIndicators,
269-
m_ui.showFrameTimes,
270-
m_ui.showHardwareInfo,
271-
m_ui.showVersion,
272-
m_ui.showSettings,
273-
m_ui.showPatches,
274-
m_ui.showInputs,
275-
m_ui.showVideoCapture,
276-
m_ui.showInputRec,
277-
m_ui.showTextureReplacements,
278-
m_ui.warnAboutUnsafeSettings};
279-
280-
for (QCheckBox* checkbox : checkboxes)
281-
checkbox->setChecked(true);
282-
}
283-
284-
void OSDSettingsWidget::onDeselectAllClicked()
258+
void OSDSettingsWidget::setAllCheckboxes(bool checked)
285259
{
286260
const QList<QCheckBox*> checkboxes = {
287261
m_ui.showSpeedPercentages,
@@ -300,7 +274,11 @@ void OSDSettingsWidget::onDeselectAllClicked()
300274
m_ui.showTextureReplacements};
301275

302276
for (QCheckBox* checkbox : checkboxes)
303-
checkbox->setChecked(false);
277+
checkbox->setChecked(checked);
278+
279+
#ifdef _WIN32
280+
m_ui.showDebugGPU->setChecked(checked);
281+
#endif
304282

305283
// Keep these checked
306284
m_ui.showStatusIndicators->setChecked(true);
@@ -309,4 +287,14 @@ void OSDSettingsWidget::onDeselectAllClicked()
309287
m_ui.warnAboutUnsafeSettings->setChecked(true);
310288
}
311289

290+
void OSDSettingsWidget::onSelectAllClicked()
291+
{
292+
setAllCheckboxes(true);
293+
}
294+
295+
void OSDSettingsWidget::onDeselectAllClicked()
296+
{
297+
setAllCheckboxes(false);
298+
}
299+
312300
#include "moc_OSDSettingsWidget.cpp"

pcsx2-qt/Settings/OSDSettingsWidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ private Q_SLOTS:
2626
void onClearOsdFontPathClicked();
2727
void onSelectAllClicked();
2828
void onDeselectAllClicked();
29+
void setAllCheckboxes(bool checked);
2930

3031
private:
3132
void loadOsdFontPathSetting();

0 commit comments

Comments
 (0)