configure_graphics: Implement custom FSR Sharpening setting
This commit is contained in:
parent
b670c350e4
commit
19a640286c
|
@ -66,6 +66,8 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* paren
|
||||||
|
|
||||||
connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,
|
connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,
|
||||||
&ConfigureGraphics::SetFSRIndicatorText);
|
&ConfigureGraphics::SetFSRIndicatorText);
|
||||||
|
ui->fsr_sharpening_combobox->setVisible(!Settings::IsConfiguringGlobal());
|
||||||
|
ui->fsr_sharpening_label->setVisible(Settings::IsConfiguringGlobal());
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureGraphics::UpdateDeviceSelection(int device) {
|
void ConfigureGraphics::UpdateDeviceSelection(int device) {
|
||||||
|
@ -151,6 +153,15 @@ void ConfigureGraphics::SetConfiguration() {
|
||||||
ConfigurationShared::SetHighlight(ui->anti_aliasing_label,
|
ConfigurationShared::SetHighlight(ui->anti_aliasing_label,
|
||||||
!Settings::values.anti_aliasing.UsingGlobal());
|
!Settings::values.anti_aliasing.UsingGlobal());
|
||||||
|
|
||||||
|
ui->fsr_sharpening_combobox->setCurrentIndex(
|
||||||
|
Settings::values.fsr_sharpening_slider.UsingGlobal() ? 0 : 1);
|
||||||
|
ui->fsr_sharpening_slider->setEnabled(
|
||||||
|
!Settings::values.fsr_sharpening_slider.UsingGlobal());
|
||||||
|
ui->fsr_sharpening_value->setEnabled(!Settings::values.fsr_sharpening_slider.UsingGlobal());
|
||||||
|
ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout,
|
||||||
|
!Settings::values.fsr_sharpening_slider.UsingGlobal());
|
||||||
|
ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());
|
||||||
|
|
||||||
ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
|
ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
|
||||||
ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
|
ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
|
||||||
ConfigurationShared::SetHighlight(ui->bg_layout, !Settings::values.bg_red.UsingGlobal());
|
ConfigurationShared::SetHighlight(ui->bg_layout, !Settings::values.bg_red.UsingGlobal());
|
||||||
|
@ -280,6 +291,13 @@ void ConfigureGraphics::ApplyConfiguration() {
|
||||||
Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
|
Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
|
||||||
Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
|
Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ui->fsr_sharpening_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
||||||
|
Settings::values.fsr_sharpening_slider.SetGlobal(true);
|
||||||
|
} else {
|
||||||
|
Settings::values.fsr_sharpening_slider.SetGlobal(false);
|
||||||
|
Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -399,6 +417,7 @@ void ConfigureGraphics::SetupPerGameUI() {
|
||||||
ui->accelerate_astc->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
|
ui->accelerate_astc->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
|
||||||
ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
|
ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
|
||||||
ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
|
ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
|
||||||
|
ui->fsr_slider_layout->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -408,6 +427,13 @@ void ConfigureGraphics::SetupPerGameUI() {
|
||||||
ConfigurationShared::SetHighlight(ui->bg_layout, index == 1);
|
ConfigurationShared::SetHighlight(ui->bg_layout, index == 1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
connect(ui->fsr_sharpening_combobox, qOverload<int>(&QComboBox::activated), this,
|
||||||
|
[this](int index) {
|
||||||
|
ui->fsr_sharpening_slider->setEnabled(index == 1);
|
||||||
|
ui->fsr_sharpening_value->setEnabled(index == 1);
|
||||||
|
ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout, index == 1);
|
||||||
|
});
|
||||||
|
|
||||||
ConfigurationShared::SetColoredTristate(
|
ConfigurationShared::SetColoredTristate(
|
||||||
ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
|
ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
|
||||||
ConfigurationShared::SetColoredTristate(ui->accelerate_astc, Settings::values.accelerate_astc,
|
ConfigurationShared::SetColoredTristate(ui->accelerate_astc, Settings::values.accelerate_astc,
|
||||||
|
|
|
@ -517,7 +517,29 @@
|
||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item alignment="Qt::AlignLeft">
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="fsr_sharpening_label_group">
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="fsr_sharpening_combobox">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Use global FSR Sharpening</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Set FSR Sharpening</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
<widget class="QLabel" name="fsr_sharpening_label">
|
<widget class="QLabel" name="fsr_sharpening_label">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||||
|
@ -530,10 +552,30 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="fsr_slider_layout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QSlider" name="fsr_sharpening_slider">
|
<widget class="QSlider" name="fsr_sharpening_slider">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
|
@ -561,7 +603,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="fsr_sharpening_value">
|
<widget class="QLabel" name="fsr_sharpening_value">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
|
@ -581,9 +623,8 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
<zorder>fsr_sharpening_value</zorder>
|
</item>
|
||||||
<zorder>fsr_sharpening_label</zorder>
|
</layout>
|
||||||
<zorder>fsr_sharpening_slider</zorder>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
Reference in New Issue