1 files changed, 32 insertions, 18 deletions

diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index cb4706bd6..07d818548 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -31,8 +31,13 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent)
 
     SetConfiguration();
 
-    connect(ui->api, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            [this] { UpdateDeviceComboBox(); });
+    connect(ui->api, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
+        UpdateDeviceComboBox();
+        if (!Settings::configuring_global) {
+            ConfigurationShared::SetHighlight(
+                ui->api_layout, ui->api->currentIndex() != ConfigurationShared::USE_GLOBAL_INDEX);
+        }
+    });
     connect(ui->device, qOverload<int>(&QComboBox::activated), this,
             [this](int device) { UpdateDeviceSelection(device); });
 
@@ -65,25 +70,25 @@ void ConfigureGraphics::SetConfiguration() {
     ui->api->setEnabled(runtime_lock);
     ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);
     ui->use_disk_shader_cache->setEnabled(runtime_lock);
+    ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
+    ui->use_asynchronous_gpu_emulation->setChecked(
+        Settings::values.use_asynchronous_gpu_emulation.GetValue());
 
     if (Settings::configuring_global) {
         ui->api->setCurrentIndex(static_cast<int>(Settings::values.renderer_backend.GetValue()));
         ui->aspect_ratio_combobox->setCurrentIndex(Settings::values.aspect_ratio.GetValue());
-        ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
-        ui->use_asynchronous_gpu_emulation->setChecked(
-            Settings::values.use_asynchronous_gpu_emulation.GetValue());
     } else {
-        ConfigurationShared::SetPerGameSetting(ui->use_disk_shader_cache,
-                                               &Settings::values.use_disk_shader_cache);
-        ConfigurationShared::SetPerGameSetting(ui->use_asynchronous_gpu_emulation,
-                                               &Settings::values.use_asynchronous_gpu_emulation);
-
         ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend);
+        ConfigurationShared::SetHighlight(ui->api_layout,
+                                          !Settings::values.renderer_backend.UsingGlobal());
         ConfigurationShared::SetPerGameSetting(ui->aspect_ratio_combobox,
                                                &Settings::values.aspect_ratio);
 
         ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
         ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
+        ConfigurationShared::SetHighlight(ui->ar_label,
+                                          !Settings::values.aspect_ratio.UsingGlobal());
+        ConfigurationShared::SetHighlight(ui->bg_layout, !Settings::values.bg_red.UsingGlobal());
     }
 
     UpdateBackgroundColorButton(QColor::fromRgbF(Settings::values.bg_red.GetValue(),
@@ -135,9 +140,10 @@ void ConfigureGraphics::ApplyConfiguration() {
                                                  ui->aspect_ratio_combobox);
 
         ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
-                                                 ui->use_disk_shader_cache);
+                                                 ui->use_disk_shader_cache, use_disk_shader_cache);
         ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
-                                                 ui->use_asynchronous_gpu_emulation);
+                                                 ui->use_asynchronous_gpu_emulation,
+                                                 use_asynchronous_gpu_emulation);
 
         if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
             Settings::values.bg_red.SetGlobal(true);
@@ -240,11 +246,19 @@ void ConfigureGraphics::SetupPerGameUI() {
         return;
     }
 
-    connect(ui->bg_combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this,
-            [this](int index) { ui->bg_button->setEnabled(index == 1); });
+    connect(ui->bg_combobox, qOverload<int>(&QComboBox::activated), this, [this](int index) {
+        ui->bg_button->setEnabled(index == 1);
+        ConfigurationShared::SetHighlight(ui->bg_layout, index == 1);
+    });
+
+    ConfigurationShared::SetColoredTristate(
+        ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
+    ConfigurationShared::SetColoredTristate(ui->use_asynchronous_gpu_emulation,
+                                            Settings::values.use_asynchronous_gpu_emulation,
+                                            use_asynchronous_gpu_emulation);
 
-    ui->use_disk_shader_cache->setTristate(true);
-    ui->use_asynchronous_gpu_emulation->setTristate(true);
-    ConfigurationShared::InsertGlobalItem(ui->aspect_ratio_combobox);
-    ConfigurationShared::InsertGlobalItem(ui->api);
+    ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label,
+                                            Settings::values.aspect_ratio.GetValue(true));
+    ConfigurationShared::InsertGlobalItem(
+        ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
 }