diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-03-23 15:17:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 15:17:24 -0400 |
| commit | 9b0471532ce8f715c2c681cb7fb7173e75708104 (patch) | |
| tree | 426ee98d5c5616aad80a7da1870d2ca288be423c /Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp | |
| parent | 2da255d8cdb2da67123296f5f091f808c696d021 (diff) | |
| parent | 561aee7707d4ace0d987deed6c8084178c653c3d (diff) | |
Merge pull request #13368 from jordan-woyak/anisotropic-filtering
Use Game Requested Anisotropic Filtering
Diffstat (limited to 'Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp index 760a4c0ff8..68592a1ce2 100644 --- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp @@ -131,17 +131,28 @@ void ConfigComplexChoice::SaveValue(int choice) void ConfigComplexChoice::UpdateComboIndex() { - auto Get = [this](auto& setting) { + auto get_layer_value = [this](auto& setting) { if (m_layer != nullptr) return static_cast<OptionVariant>(m_layer->Get(setting)); return static_cast<OptionVariant>(Config::Get(setting)); }; - std::pair<OptionVariant, OptionVariant> values = - std::make_pair(std::visit(Get, m_setting1), std::visit(Get, m_setting2)); + auto get_default_value = [](auto& setting) { return OptionVariant(setting.GetDefaultValue()); }; - auto it = std::find(m_options.begin(), m_options.end(), values); + auto is_current_value = [&](const InfoVariant& info, const OptionVariant& option) { + return std::visit(get_layer_value, info) == + (std::holds_alternative<Config::DefaultState>(option) ? + std::visit(get_default_value, info) : + option); + }; + + auto is_correct_option = [&](const std::pair<OptionVariant, OptionVariant>& option) { + return is_current_value(m_setting1, option.first) && + is_current_value(m_setting2, option.second); + }; + + auto it = std::find_if(m_options.begin(), m_options.end(), is_correct_option); int index = static_cast<int>(std::distance(m_options.begin(), it)); // Will crash if not blocked |
