piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13622 from TryTwo/Settings_Bugfix

Browse Source 
Settings: Bugfix. GFX settings getting set without user input
This commit is contained in:
Admiral H. Curtiss
2025-05-03 18:36:36 +02:00
committed by GitHub
parent ffd78711be c1d0a49f35
commit dcc09906e5
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
View File

@ -45,8 +45,8 @@ ConfigStringChoice::ConfigStringChoice(const std::vector<std::pair<QString, QStr
for (const auto& [option_text, option_data] : options)
addItem(option_text, option_data);
connect(this, &QComboBox::currentIndexChanged, this, &ConfigStringChoice::Update);
Load();
connect(this, &QComboBox::currentIndexChanged, this, &ConfigStringChoice::Update);
}
void ConfigStringChoice::Update(int index)

11
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
View File

@ -79,6 +79,8 @@ void GeneralWidget::CreateWidgets()
Config::GFX_CUSTOM_ASPECT_RATIO_WIDTH, m_game_layer);
m_custom_aspect_height = new ConfigInteger(1, MAX_CUSTOM_ASPECT_RATIO_RESOLUTION,
Config::GFX_CUSTOM_ASPECT_RATIO_HEIGHT, m_game_layer);
ToggleCustomAspectRatio(m_aspect_combo->currentIndex());
m_adapter_combo = new ToolTipComboBox;
m_enable_vsync = new ConfigBool(tr("V-Sync"), Config::GFX_VSYNC, m_game_layer);
m_enable_fullscreen =
@ -169,14 +171,17 @@ void GeneralWidget::ConnectWidgets()
Config::SetBaseOrCurrent(Config::GFX_ADAPTER, index);
emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND)));
});
connect(m_aspect_combo, qOverload<int>(&QComboBox::currentIndexChanged), this, [&](int index) {
connect(m_aspect_combo, &QComboBox::currentIndexChanged, this,
&GeneralWidget::ToggleCustomAspectRatio);
}
void GeneralWidget::ToggleCustomAspectRatio(int index)
{
const bool is_custom_aspect_ratio = (index == static_cast<int>(AspectMode::Custom)) ||
(index == static_cast<int>(AspectMode::CustomStretch));
m_custom_aspect_label->setHidden(!is_custom_aspect_ratio);
m_custom_aspect_width->setHidden(!is_custom_aspect_ratio);
m_custom_aspect_height->setHidden(!is_custom_aspect_ratio);
});
m_aspect_combo->currentIndexChanged(m_aspect_combo->currentIndex());
}
void GeneralWidget::BackendWarning()

1
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
View File

@ -40,6 +40,7 @@ private:
void BackendWarning();
void CreateWidgets();
void ToggleCustomAspectRatio(int index);
void ConnectWidgets();
void AddDescriptions();