summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2020-07-14 00:36:58 -0400
committerGravatar lat9nq2020-07-19 13:26:55 -0400
commitd5fdbd88c8a94421e48197b274fa47c6a8f93926 (patch)
tree49b2e7f5d645419c286b9bbb0c646163b88219d3
parentconfigure_system: Highlight labels on startup (diff)
downloadyuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.gz
yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.xz
yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.zip
clang-format
-rw-r--r--src/yuzu/configuration/configuration_shared.cpp4
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp3
-rw-r--r--src/yuzu/configuration/configure_system.cpp12
3 files changed, 11 insertions, 8 deletions
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 0c7caf8b5..cb47c8eb5 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -140,8 +140,8 @@ void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::str
140void ConfigurationShared::SetColoredComboBox(QComboBox* combobox, QWidget* target, 140void ConfigurationShared::SetColoredComboBox(QComboBox* combobox, QWidget* target,
141 const std::string& target_name, int global) { 141 const std::string& target_name, int global) {
142 InsertGlobalItem(combobox, global); 142 InsertGlobalItem(combobox, global);
143 QObject::connect(combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), 143 QObject::connect(combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), target,
144 target, [target, target_name](int index) { 144 [target, target_name](int index) {
145 ConfigurationShared::SetHighlight(target, target_name, index != 0); 145 ConfigurationShared::SetHighlight(target, target_name, index != 0);
146 }); 146 });
147} 147}
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 74ee8adfb..2867f3717 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -263,8 +263,7 @@ void ConfigureGraphics::SetupPerGameUI() {
263 Settings::values.use_asynchronous_gpu_emulation, 263 Settings::values.use_asynchronous_gpu_emulation,
264 ConfigurationShared::trackers.use_asynchronous_gpu_emulation); 264 ConfigurationShared::trackers.use_asynchronous_gpu_emulation);
265 265
266 ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, 266 ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label",
267 "ar_label",
268 Settings::values.aspect_ratio.GetValue(true)); 267 Settings::values.aspect_ratio.GetValue(true));
269 ConfigurationShared::InsertGlobalItem( 268 ConfigurationShared::InsertGlobalItem(
270 ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true))); 269 ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index bc4afdbc7..5b485dd47 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -90,10 +90,14 @@ void ConfigureSystem::SetConfiguration() {
90 &Settings::values.time_zone_index); 90 &Settings::values.time_zone_index);
91 ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); 91 ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
92 92
93 ConfigurationShared::SetHighlight(ui->label_language, "label_language", !Settings::values.language_index.UsingGlobal()); 93 ConfigurationShared::SetHighlight(ui->label_language, "label_language",
94 ConfigurationShared::SetHighlight(ui->label_region, "label_region", !Settings::values.region_index.UsingGlobal()); 94 !Settings::values.language_index.UsingGlobal());
95 ConfigurationShared::SetHighlight(ui->label_timezone, "label_timezone", !Settings::values.time_zone_index.UsingGlobal()); 95 ConfigurationShared::SetHighlight(ui->label_region, "label_region",
96 ConfigurationShared::SetHighlight(ui->label_sound, "label_sound", !Settings::values.sound_index.UsingGlobal()); 96 !Settings::values.region_index.UsingGlobal());
97 ConfigurationShared::SetHighlight(ui->label_timezone, "label_timezone",
98 !Settings::values.time_zone_index.UsingGlobal());
99 ConfigurationShared::SetHighlight(ui->label_sound, "label_sound",
100 !Settings::values.sound_index.UsingGlobal());
97 } 101 }
98} 102}
99 103