summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp6
-rw-r--r--src/yuzu/configuration/configure_graphics.ui67
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.cpp24
3 files changed, 43 insertions, 54 deletions
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index c79b256f9..74ee8adfb 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -87,7 +87,7 @@ void ConfigureGraphics::SetConfiguration() {
87 87
88 ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1); 88 ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
89 ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal()); 89 ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
90 ConfigurationShared::SetHighlight(ui->aspect_ratio_layout, "aspect_ratio_layout", 90 ConfigurationShared::SetHighlight(ui->ar_label, "ar_label",
91 !Settings::values.aspect_ratio.UsingGlobal()); 91 !Settings::values.aspect_ratio.UsingGlobal());
92 ConfigurationShared::SetHighlight(ui->bg_layout, "bg_layout", 92 ConfigurationShared::SetHighlight(ui->bg_layout, "bg_layout",
93 !Settings::values.bg_red.UsingGlobal()); 93 !Settings::values.bg_red.UsingGlobal());
@@ -263,8 +263,8 @@ 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->aspect_ratio_layout, 266 ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label,
267 "aspect_ratio_layout", 267 "ar_label",
268 Settings::values.aspect_ratio.GetValue(true)); 268 Settings::values.aspect_ratio.GetValue(true));
269 ConfigurationShared::InsertGlobalItem( 269 ConfigurationShared::InsertGlobalItem(
270 ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true))); 270 ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 6164569fe..e3bbf2f59 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -6,7 +6,7 @@
6 <rect> 6 <rect>
7 <x>0</x> 7 <x>0</x>
8 <y>0</y> 8 <y>0</y>
9 <width>400</width> 9 <width>437</width>
10 <height>321</height> 10 <height>321</height>
11 </rect> 11 </rect>
12 </property> 12 </property>
@@ -24,7 +24,7 @@
24 <layout class="QVBoxLayout" name="verticalLayout_3"> 24 <layout class="QVBoxLayout" name="verticalLayout_3">
25 <item> 25 <item>
26 <widget class="QWidget" name="api_layout" native="true"> 26 <widget class="QWidget" name="api_layout" native="true">
27 <layout class="QVBoxLayout" name="verticalLayout_5"> 27 <layout class="QGridLayout" name="gridLayout">
28 <property name="leftMargin"> 28 <property name="leftMargin">
29 <number>0</number> 29 <number>0</number>
30 </property> 30 </property>
@@ -37,40 +37,39 @@
37 <property name="bottomMargin"> 37 <property name="bottomMargin">
38 <number>0</number> 38 <number>0</number>
39 </property> 39 </property>
40 <item> 40 <property name="horizontalSpacing">
41 <layout class="QGridLayout" name="gridLayout"> 41 <number>6</number>
42 <item row="0" column="1"> 42 </property>
43 <widget class="QComboBox" name="api"> 43 <item row="0" column="0">
44 <item> 44 <widget class="QLabel" name="api_label">
45 <property name="text"> 45 <property name="text">
46 <string notr="true">OpenGL</string> 46 <string>API:</string>
47 </property> 47 </property>
48 </item> 48 </widget>
49 <item> 49 </item>
50 <property name="text"> 50 <item row="0" column="1">
51 <string notr="true">Vulkan</string> 51 <widget class="QComboBox" name="api">
52 </property> 52 <item>
53 </item> 53 <property name="text">
54 </widget> 54 <string notr="true">OpenGL</string>
55 </item> 55 </property>
56 <item row="0" column="0">
57 <widget class="QLabel" name="label_2">
58 <property name="text">
59 <string>API:</string>
60 </property>
61 </widget>
62 </item>
63 <item row="1" column="1">
64 <widget class="QComboBox" name="device"/>
65 </item> 56 </item>
66 <item row="1" column="0"> 57 <item>
67 <widget class="QLabel" name="label_3"> 58 <property name="text">
68 <property name="text"> 59 <string notr="true">Vulkan</string>
69 <string>Device:</string> 60 </property>
70 </property>
71 </widget>
72 </item> 61 </item>
73 </layout> 62 </widget>
63 </item>
64 <item row="1" column="0">
65 <widget class="QLabel" name="device_label">
66 <property name="text">
67 <string>Device:</string>
68 </property>
69 </widget>
70 </item>
71 <item row="1" column="1">
72 <widget class="QComboBox" name="device"/>
74 </item> 73 </item>
75 </layout> 74 </layout>
76 </widget> 75 </widget>
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 1d9a1076e..d02e6c798 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -43,9 +43,9 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
43 ConfigurationShared::SetPerGameSetting(ui->gpu_accuracy, &Settings::values.gpu_accuracy); 43 ConfigurationShared::SetPerGameSetting(ui->gpu_accuracy, &Settings::values.gpu_accuracy);
44 ConfigurationShared::SetPerGameSetting(ui->anisotropic_filtering_combobox, 44 ConfigurationShared::SetPerGameSetting(ui->anisotropic_filtering_combobox,
45 &Settings::values.max_anisotropy); 45 &Settings::values.max_anisotropy);
46 ConfigurationShared::SetHighlight(ui->gpu_accuracy_layout, "gpu_accuracy_layout", 46 ConfigurationShared::SetHighlight(ui->label_gpu_accuracy, "label_gpu_accuracy",
47 !Settings::values.gpu_accuracy.UsingGlobal()); 47 !Settings::values.gpu_accuracy.UsingGlobal());
48 ConfigurationShared::SetHighlight(ui->af_layout, "af_layout", 48 ConfigurationShared::SetHighlight(ui->af_label, "af_label",
49 !Settings::values.max_anisotropy.UsingGlobal()); 49 !Settings::values.max_anisotropy.UsingGlobal());
50 } 50 }
51} 51}
@@ -156,20 +156,10 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {
156 ConfigurationShared::SetColoredTristate(ui->force_30fps_mode, "force_30fps_mode", 156 ConfigurationShared::SetColoredTristate(ui->force_30fps_mode, "force_30fps_mode",
157 Settings::values.force_30fps_mode, 157 Settings::values.force_30fps_mode,
158 ConfigurationShared::trackers.force_30fps_mode); 158 ConfigurationShared::trackers.force_30fps_mode);
159 ConfigurationShared::InsertGlobalItem( 159 ConfigurationShared::SetColoredComboBox(
160 ui->gpu_accuracy, static_cast<int>(Settings::values.gpu_accuracy.GetValue(true))); 160 ui->gpu_accuracy, ui->label_gpu_accuracy, "label_gpu_accuracy",
161 ConfigurationShared::InsertGlobalItem( 161 static_cast<int>(Settings::values.gpu_accuracy.GetValue(true)));
162 ui->anisotropic_filtering_combobox, 162 ConfigurationShared::SetColoredComboBox(
163 ui->anisotropic_filtering_combobox, ui->af_label, "af_label",
163 static_cast<int>(Settings::values.max_anisotropy.GetValue(true))); 164 static_cast<int>(Settings::values.max_anisotropy.GetValue(true)));
164
165 connect(ui->gpu_accuracy, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this,
166 [this](int index) {
167 ConfigurationShared::SetHighlight(ui->gpu_accuracy_layout, "gpu_accuracy_layout",
168 index != 0);
169 });
170
171 connect(ui->anisotropic_filtering_combobox,
172 static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [this](int index) {
173 ConfigurationShared::SetHighlight(ui->af_layout, "af_layout", index != 0);
174 });
175} 165}
HIC SVNT DRACONES