mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 20:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

EnhancementsWidget: Fix display of default post-processing effect

Browse source 
Show "(off)" instead of "" when the default post-processing effect is
selected. This also indirectly fixes issues with keyboard navigation of
the post-processing effect combobox when the default is selected,
resolving https://bugs.dolphin-emu.org/issues/13863.

m_post_processing_effect was previously using the ConfigStringChoice
constructor that assumes the text and data of each option are identical.
This is true for all the other effects, but since "(off)" has the config
value of "" this assumption was failing for it, causing the combobox to
be blank.
This commit is contained in:
Dentomologist 2025-04-27 11:40:51 -07:00
commit 4303e086bf
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
View file

@ -137,8 +137,12 @@ void EnhancementsWidget::CreateWidgets()
m_configure_color_correction = new ToolTipPushButton(tr("Configure")); m_configure_color_correction = new ToolTipPushButton(tr("Configure"));
m_post_processing_effect = new ConfigStringChoice(VideoCommon::PostProcessing::GetShaderList(), // The post-processing effect "(off)" has the config value "", so we need to use the constructor
Config::GFX_ENHANCE_POST_SHADER, m_game_layer); // that sets ConfigStringChoice's m_text_is_data to false. m_post_processing_effect is cleared in
// LoadPostProcessingShaders so it's pointless to fill it with real data here.
const std::vector<std::pair<QString, QString>> separate_data_and_text;
m_post_processing_effect =
new ConfigStringChoice(separate_data_and_text, Config::GFX_ENHANCE_POST_SHADER, m_game_layer);
m_configure_post_processing_effect = new NonDefaultQPushButton(tr("Configure")); m_configure_post_processing_effect = new NonDefaultQPushButton(tr("Configure"));
m_configure_post_processing_effect->setDisabled(true); m_configure_post_processing_effect->setDisabled(true);
@ -287,7 +291,7 @@ void EnhancementsWidget::LoadPostProcessingShaders()
// Populate widget // Populate widget
if (stereo_mode != StereoMode::Anaglyph && stereo_mode != StereoMode::Passive) if (stereo_mode != StereoMode::Anaglyph && stereo_mode != StereoMode::Passive)
m_post_processing_effect->addItem(tr("(off)")); m_post_processing_effect->addItem(tr("(off)"), QStringLiteral(""));
auto selected_shader = ReadSetting(Config::GFX_ENHANCE_POST_SHADER); auto selected_shader = ReadSetting(Config::GFX_ENHANCE_POST_SHADER);
@ -295,7 +299,8 @@ void EnhancementsWidget::LoadPostProcessingShaders()
for (const auto& shader : shaders) for (const auto& shader : shaders)
{ {
m_post_processing_effect->addItem(QString::fromStdString(shader)); const QString name = QString::fromStdString(shader);
m_post_processing_effect->addItem(name, name);
if (selected_shader == shader) if (selected_shader == shader)
{ {
m_post_processing_effect->setCurrentIndex(m_post_processing_effect->count() - 1); m_post_processing_effect->setCurrentIndex(m_post_processing_effect->count() - 1);
@ -314,7 +319,7 @@ void EnhancementsWidget::LoadPostProcessingShaders()
selected_shader = ""; selected_shader = "";
const int index = const int index =
std::max(0, m_post_processing_effect->findText(QString::fromStdString(selected_shader))); std::max(0, m_post_processing_effect->findData(QString::fromStdString(selected_shader)));
m_post_processing_effect->setCurrentIndex(index); m_post_processing_effect->setCurrentIndex(index);
// Save forced shader, but avoid forcing an option into a game ini layer. // Save forced shader, but avoid forcing an option into a game ini layer.