summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2024-12-22 20:42:28 +0100
committerGitHub <noreply@github.com>2024-12-22 20:42:28 +0100
commit5641b83d4ee5775dc244db0007dea582b559893e (patch)
treef18bf153dbe039e3f4892f3807c6d0885518432c /Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
parentbb8c0a795f35490c5959aade4ea0abb430d4edc8 (diff)
parent9541bb6cf7f966cc9fefaaa4ef2bc4d45babed22 (diff)
Merge pull request #13063 from TryTwo/PR_GameSettings
Add ability to edit game-specific GFX settings from game properties tab.
Diffstat (limited to 'Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp161
1 files changed, 122 insertions, 39 deletions
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
index ad65f0c96b..b1c12a4172 100644
--- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
+++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
@@ -5,85 +5,168 @@
#include <QSignalBlocker>
-#include "Common/Config/Config.h"
-
-#include "DolphinQt/Settings.h"
-
-ConfigChoice::ConfigChoice(const QStringList& options, const Config::Info<int>& setting)
- : m_setting(setting)
+ConfigChoice::ConfigChoice(const QStringList& options, const Config::Info<int>& setting,
+ Config::Layer* layer)
+ : ConfigControl(setting.GetLocation(), layer), m_setting(setting)
{
addItems(options);
- connect(this, &QComboBox::currentIndexChanged, this, &ConfigChoice::Update);
- setCurrentIndex(Config::Get(m_setting));
-
- connect(&Settings::Instance(), &Settings::ConfigChanged, this, [this] {
- QFont bf = font();
- bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
- setFont(bf);
+ setCurrentIndex(ReadValue(setting));
- const QSignalBlocker blocker(this);
- setCurrentIndex(Config::Get(m_setting));
- });
+ connect(this, &QComboBox::currentIndexChanged, this, &ConfigChoice::Update);
}
void ConfigChoice::Update(int choice)
{
- Config::SetBaseOrCurrent(m_setting, choice);
+ SaveValue(m_setting, choice);
+}
+
+void ConfigChoice::OnConfigChanged()
+{
+ setCurrentIndex(ReadValue(m_setting));
}
ConfigStringChoice::ConfigStringChoice(const std::vector<std::string>& options,
- const Config::Info<std::string>& setting)
- : m_setting(setting), m_text_is_data(true)
+ const Config::Info<std::string>& setting,
+ Config::Layer* layer)
+ : ConfigControl(setting.GetLocation(), layer), m_setting(setting), m_text_is_data(true)
{
for (const auto& op : options)
addItem(QString::fromStdString(op));
- Connect();
Load();
+ connect(this, &QComboBox::currentIndexChanged, this, &ConfigStringChoice::Update);
}
ConfigStringChoice::ConfigStringChoice(const std::vector<std::pair<QString, QString>>& options,
- const Config::Info<std::string>& setting)
- : m_setting(setting), m_text_is_data(false)
+ const Config::Info<std::string>& setting,
+ Config::Layer* layer)
+ : ConfigControl(setting.GetLocation(), layer), m_setting(setting), m_text_is_data(false)
{
for (const auto& [option_text, option_data] : options)
addItem(option_text, option_data);
- Connect();
+ connect(this, &QComboBox::currentIndexChanged, this, &ConfigStringChoice::Update);
Load();
}
-void ConfigStringChoice::Connect()
+void ConfigStringChoice::Update(int index)
{
- const auto on_config_changed = [this]() {
- QFont bf = font();
- bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
- setFont(bf);
+ if (m_text_is_data)
+ SaveValue(m_setting, itemText(index).toStdString());
+ else
+ SaveValue(m_setting, itemData(index).toString().toStdString());
+}
- Load();
- };
+void ConfigStringChoice::Load()
+{
+ const QString setting_value = QString::fromStdString(ReadValue(m_setting));
+ const int index = m_text_is_data ? findText(setting_value) : findData(setting_value);
- connect(&Settings::Instance(), &Settings::ConfigChanged, this, on_config_changed);
- connect(this, &QComboBox::currentIndexChanged, this, &ConfigStringChoice::Update);
+ // This can be called publicly.
+ const QSignalBlocker block(this);
+ setCurrentIndex(index);
}
-void ConfigStringChoice::Update(int index)
+void ConfigStringChoice::OnConfigChanged()
{
- if (m_text_is_data)
+ Load();
+}
+
+ConfigComplexChoice::ConfigComplexChoice(const InfoVariant setting1, const InfoVariant setting2,
+ Config::Layer* layer)
+ : m_setting1(setting1), m_setting2(setting2), m_layer(layer)
+{
+ connect(&Settings::Instance(), &Settings::ConfigChanged, this, &ConfigComplexChoice::Refresh);
+ connect(this, &QComboBox::currentIndexChanged, this, &ConfigComplexChoice::SaveValue);
+}
+
+void ConfigComplexChoice::Refresh()
+{
+ auto& location = GetLocation();
+
+ QFont bf = font();
+ if (m_layer != nullptr)
{
- Config::SetBaseOrCurrent(m_setting, itemText(index).toStdString());
+ bf.setBold(m_layer->Exists(location.first) || m_layer->Exists(location.second));
}
else
{
- Config::SetBaseOrCurrent(m_setting, itemData(index).toString().toStdString());
+ bf.setBold(Config::GetActiveLayerForConfig(location.first) != Config::LayerType::Base ||
+ Config::GetActiveLayerForConfig(location.second) != Config::LayerType::Base);
}
+
+ setFont(bf);
+ UpdateComboIndex();
}
-void ConfigStringChoice::Load()
+void ConfigComplexChoice::Add(const QString& name, const OptionVariant option1,
+ const OptionVariant option2)
+{
+ const QSignalBlocker blocker(this);
+ addItem(name);
+ m_options.push_back(std::make_pair(option1, option2));
+}
+
+void ConfigComplexChoice::Reset()
{
- const QString setting_value = QString::fromStdString(Config::Get(m_setting));
+ clear();
+ m_options.clear();
+}
+
+void ConfigComplexChoice::SaveValue(int choice)
+{
+ auto Set = [this, choice](auto& setting, auto& value) {
+ if (m_layer != nullptr)
+ {
+ m_layer->Set(setting.GetLocation(), value);
+ Config::OnConfigChanged();
+ return;
+ }
+
+ Config::SetBaseOrCurrent(setting, value);
+ };
+
+ std::visit(Set, m_setting1, m_options[choice].first);
+ std::visit(Set, m_setting2, m_options[choice].second);
+}
+
+void ConfigComplexChoice::UpdateComboIndex()
+{
+ auto Get = [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 it = std::find(m_options.begin(), m_options.end(), values);
+ int index = static_cast<int>(std::distance(m_options.begin(), it));
- const int index = m_text_is_data ? findText(setting_value) : findData(setting_value);
const QSignalBlocker blocker(this);
setCurrentIndex(index);
}
+
+const std::pair<Config::Location, Config::Location> ConfigComplexChoice::GetLocation() const
+{
+ auto visit = [](auto& v) { return v.GetLocation(); };
+
+ return {std::visit(visit, m_setting1), std::visit(visit, m_setting2)};
+}
+
+void ConfigComplexChoice::mousePressEvent(QMouseEvent* event)
+{
+ if (event->button() == Qt::RightButton && m_layer != nullptr)
+ {
+ auto& location = GetLocation();
+ m_layer->DeleteKey(location.first);
+ m_layer->DeleteKey(location.second);
+ Config::OnConfigChanged();
+ }
+ else
+ {
+ QComboBox::mousePressEvent(event);
+ }
+};