diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index f09657556e..af157db738 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -108,6 +108,14 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowResolution, "EmuCore/GS", "OsdShowResolution", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowGSStats, "EmuCore/GS", "OsdShowGSStats", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowIndicators, "EmuCore/GS", "OsdShowIndicators", true); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fxaa, "EmuCore/GS", "fxaa", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.shadeBoost, "EmuCore/GS", "ShadeBoost", false); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.shadeBoostBrightness, "EmuCore/GS", "ShadeBoost_Brightness", false); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.shadeBoostContrast, "EmuCore/GS", "ShadeBoost_Contrast", false); + SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.shadeBoostSaturation, "EmuCore/GS", "ShadeBoost_Saturation", false); + + connect(m_ui.shadeBoost, QOverload::of(&QCheckBox::stateChanged), this, &GraphicsSettingsWidget::onShadeBoostChanged); + onShadeBoostChanged(); dialog->registerWidgetHelp(m_ui.osdShowMessages, tr("Show OSD Messages"), tr("Checked"), tr("Shows on-screen-display messages when events occur such as save states being " @@ -284,6 +292,14 @@ void GraphicsSettingsWidget::onFullscreenModeChanged(int index) void GraphicsSettingsWidget::onIntegerScalingChanged() { m_ui.bilinearFiltering->setEnabled(!m_ui.integerScaling->isChecked()); } +void GraphicsSettingsWidget::onShadeBoostChanged() +{ + const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore/GS", "ShadeBoost", false); + m_ui.shadeBoostBrightness->setEnabled(enabled); + m_ui.shadeBoostContrast->setEnabled(enabled); + m_ui.shadeBoostSaturation->setEnabled(enabled); +} + void GraphicsSettingsWidget::onGpuPaletteConversionChanged(int state) { const bool enabled = state == Qt::CheckState::PartiallyChecked ? QtHost::GetBaseBoolSettingValue("EmuCore/GS", "paltex", false) : state; diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.h b/pcsx2-qt/Settings/GraphicsSettingsWidget.h index 708b3f598c..2bcf6820cc 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.h +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.h @@ -43,6 +43,7 @@ private Q_SLOTS: void onIntegerScalingChanged(); void onGpuPaletteConversionChanged(int state); void onFullscreenModeChanged(int index); + void onShadeBoostChanged(); private: GSRendererType getEffectiveRenderer() const; diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui index d35bef87b2..1a2fb1b1e7 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui @@ -865,86 +865,199 @@ On-Screen Display - - - - - OSD Scale: + + + + + On-Screen Display + + + + + OSD Scale: + + + + + + + % + + + 100 + + + 500 + + + + + + + + + Show Notifications + + + + + + + Show Speed + + + + + + + Show FPS + + + + + + + Show Resolution + + + + + + + Show CPU Usage + + + + + + + Show GPU Usage + + + + + + + Show Statistics + + + + + + + Show Indicators + + + + + + - - - - % - - - 100 - - - 500 + + + + Post-Processing + + + + + Shade Boost + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Brightness: + + + + + + + 1 + + + 100 + + + + + + + Contrast: + + + + + + + 1 + + + 100 + + + + + + + Saturation + + + + + + + 1 + + + 100 + + + + + + + + + FXAA + + + + - - - - - - Show Notifications - - - - - - - Show Speed - - - - - - - Show FPS - - - - - - - Show Resolution - - - - - - - Show CPU Usage - - - - - - - Show GPU Usage - - - - - - - Show Statistics - - - - - - - Show Indicators - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + @@ -962,7 +1075,7 @@ - Override Texture Barriers: + Override Texture Barriers: @@ -996,12 +1109,12 @@ - Automatic (Default) + Automatic (Default) - Force Disabled + Force Disabled @@ -1039,7 +1152,7 @@ Disable Framebuffer Fetch - + diff --git a/pcsx2-qt/Settings/OSDSettingsWidget.ui b/pcsx2-qt/Settings/OSDSettingsWidget.ui deleted file mode 100644 index fd5fe9ce83..0000000000 --- a/pcsx2-qt/Settings/OSDSettingsWidget.ui +++ /dev/null @@ -1,121 +0,0 @@ - - - OSDSettingsWidget - - - - 0 - 0 - 604 - 469 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - On-Screen Display - - - - - - OSD Scale: - - - - - - - % - - - 100 - - - 500 - - - - - - - - - Show Notifications - - - - - - - Show Speed - - - - - - - Show FPS - - - - - - - Show Resolution - - - - - - - Show CPU Usage - - - - - - - Show Statistics - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - -