From c7b9ee92b7f25aae312f7d0f292d6d3d7b1c8c08 Mon Sep 17 00:00:00 2001
From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:37:40 +0700
Subject: [PATCH] Qt: Properly Grey Out Checkboxes When Perf OSD is Disabled

---
 pcsx2-qt/Settings/GraphicsSettingsWidget.cpp |   2 +
 pcsx2-qt/Settings/GraphicsSettingsWidget.ui  | 140 +++++++++----------
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
index 6307c6beb8..311143fd46 100644
--- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
+++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
@@ -931,12 +931,14 @@ void GraphicsSettingsWidget::onPerformancePosChanged()
 {
 	const bool enabled = m_ui.osdPerformancePos->currentIndex() != (m_dialog->isPerGameSettings() ? 1 : 0);
 
+	m_ui.osdShowVPS->setEnabled(enabled);
 	m_ui.osdShowSpeed->setEnabled(enabled);
 	m_ui.osdShowFPS->setEnabled(enabled);
 	m_ui.osdShowCPU->setEnabled(enabled);
 	m_ui.osdShowGPU->setEnabled(enabled);
 	m_ui.osdShowResolution->setEnabled(enabled);
 	m_ui.osdShowGSStats->setEnabled(enabled);
+	m_ui.osdShowHardwareInfo->setEnabled(enabled);
 	m_ui.osdShowIndicators->setEnabled(enabled);
 	m_ui.osdShowFrameTimes->setEnabled(enabled);
 	m_ui.osdShowVersion->setEnabled(enabled);
diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
index e097717193..d1b6a9031d 100644
--- a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
+++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>720</width>
-    <height>562</height>
+    <height>594</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -1632,6 +1632,13 @@
           </item>
           <item row="3" column="0" colspan="2">
            <layout class="QGridLayout" name="osdOptionLayout">
+            <item row="2" column="1">
+             <widget class="QCheckBox" name="osdShowSpeed">
+              <property name="text">
+               <string>Show Speed Percentages</string>
+              </property>
+             </widget>
+            </item>
             <item row="6" column="1">
              <widget class="QCheckBox" name="osdShowVideoCapture">
               <property name="text">
@@ -1639,13 +1646,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="osdShowGPU">
-              <property name="text">
-               <string>Show GPU Usage</string>
-              </property>
-             </widget>
-            </item>
             <item row="5" column="1">
              <widget class="QCheckBox" name="osdShowInputRec">
               <property name="text">
@@ -1653,48 +1653,6 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <widget class="QCheckBox" name="osdShowInputs">
-              <property name="text">
-               <string>Show Inputs</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="osdShowSpeed">
-              <property name="text">
-               <string>Show Speed Percentages</string>
-              </property>
-             </widget>
-            </item>
-            <item row="6" column="0">
-             <widget class="QCheckBox" name="osdShowHardwareInfo">
-              <property name="text">
-               <string>Show Hardware Info</string>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="0">
-             <widget class="QCheckBox" name="osdShowFrameTimes">
-              <property name="text">
-               <string>Show Frame Times</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QCheckBox" name="osdShowSettings">
-              <property name="text">
-               <string>Show Settings</string>
-              </property>
-             </widget>
-            </item>
-            <item row="7" column="0">
-             <widget class="QCheckBox" name="warnAboutUnsafeSettings">
-              <property name="text">
-               <string>Warn About Unsafe Settings</string>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="0">
              <widget class="QCheckBox" name="osdShowIndicators">
               <property name="text">
@@ -1702,20 +1660,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="osdShowCPU">
-              <property name="text">
-               <string>Show CPU Usage</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QCheckBox" name="osdShowGSStats">
-              <property name="text">
-               <string>Show Statistics</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="QCheckBox" name="osdShowFPS">
               <property name="text">
@@ -1723,10 +1667,52 @@
               </property>
              </widget>
             </item>
-            <item row="7" column="1">
-             <widget class="QCheckBox" name="osdShowVersion">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="osdShowVPS">
               <property name="text">
-               <string>Show PCSX2 Version</string>
+               <string>Show VPS</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QCheckBox" name="osdShowInputs">
+              <property name="text">
+               <string>Show Inputs</string>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="0">
+             <widget class="QCheckBox" name="osdShowHardwareInfo">
+              <property name="text">
+               <string>Show Hardware Info</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="osdShowGPU">
+              <property name="text">
+               <string>Show GPU Usage</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="osdShowCPU">
+              <property name="text">
+               <string>Show CPU Usage</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QCheckBox" name="osdShowSettings">
+              <property name="text">
+               <string>Show Settings</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QCheckBox" name="osdShowFrameTimes">
+              <property name="text">
+               <string>Show Frame Times</string>
               </property>
              </widget>
             </item>
@@ -1737,10 +1723,24 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="osdShowVPS">
+            <item row="4" column="0">
+             <widget class="QCheckBox" name="osdShowGSStats">
               <property name="text">
-               <string>Show VPS</string>
+               <string>Show Statistics</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="0">
+             <widget class="QCheckBox" name="osdShowVersion">
+              <property name="text">
+               <string>Show PCSX2 Version</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="1">
+             <widget class="QCheckBox" name="warnAboutUnsafeSettings">
+              <property name="text">
+               <string>Warn About Unsafe Settings</string>
               </property>
              </widget>
             </item>