diff options
| author | lat9nq <lat9nq@virginia.edu> | 2020-07-14 06:36:58 +0200 |
|---|---|---|
| committer | lat9nq <lat9nq@virginia.edu> | 2020-07-19 19:26:55 +0200 |
| commit | d5fdbd88c8a94421e48197b274fa47c6a8f93926 (patch) | |
| tree | 49b2e7f5d645419c286b9bbb0c646163b88219d3 /src | |
| parent | configure_system: Highlight labels on startup (diff) | |
| download | yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.gz yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.bz2 yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.lz yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.xz yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.tar.zst yuzu-d5fdbd88c8a94421e48197b274fa47c6a8f93926.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configuration_shared.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 12 |
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 void ConfigurationShared::SetColoredComboBox(QComboBox* combobox, QWidget* target, const std::string& target_name, int global) { InsertGlobalItem(combobox, global); - QObject::connect(combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), - target, [target, target_name](int index) { + QObject::connect(combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), target, + [target, target_name](int index) { ConfigurationShared::SetHighlight(target, target_name, index != 0); }); } 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() { Settings::values.use_asynchronous_gpu_emulation, ConfigurationShared::trackers.use_asynchronous_gpu_emulation); - ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, - "ar_label", + ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label", Settings::values.aspect_ratio.GetValue(true)); ConfigurationShared::InsertGlobalItem( 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() { &Settings::values.time_zone_index); ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); - ConfigurationShared::SetHighlight(ui->label_language, "label_language", !Settings::values.language_index.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->label_region, "label_region", !Settings::values.region_index.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->label_timezone, "label_timezone", !Settings::values.time_zone_index.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->label_sound, "label_sound", !Settings::values.sound_index.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->label_language, "label_language", + !Settings::values.language_index.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->label_region, "label_region", + !Settings::values.region_index.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->label_timezone, "label_timezone", + !Settings::values.time_zone_index.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->label_sound, "label_sound", + !Settings::values.sound_index.UsingGlobal()); } } |