notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration_shared: Make CheckState strongly typed 

Also gets rid of unnecessary explicit namespace usage.
This commit is contained in:
lat9nq 2020-07-14 15:40:02 -04:00
parent 55ac28769a
commit 335aef78c4
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/yuzu/configuration/configuration_shared.cpp
View File

@ -95,17 +95,17 @@ void ConfigurationShared::SetHighlight(QWidget* widget, const std::string& name,
void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::string& name,
const Settings::Setting<bool>& setting,
ConfigurationShared::CheckState& tracker) {
CheckState& tracker) {
if (setting.UsingGlobal()) {
tracker = CheckState::Global;
} else {
tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off;
}
SetHighlight(checkbox, name, tracker != CheckState::Global);
QObject::connect(
checkbox, &QCheckBox::clicked, checkbox, [checkbox, name, setting, &tracker]() {
tracker =
static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count);
QObject::connect(checkbox, &QCheckBox::clicked, checkbox,
[checkbox, name, setting, &tracker]() {
tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
static_cast<int>(CheckState::Count));
if (tracker == CheckState::Global) {
checkbox->setChecked(setting.GetValue(true));
}
@ -115,17 +115,17 @@ void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::str
void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::string& name,
bool global, bool state, bool global_state,
ConfigurationShared::CheckState& tracker) {
CheckState& tracker) {
if (global) {
tracker = CheckState::Global;
} else {
tracker = (state == global_state) ? CheckState::On : CheckState::Off;
}
SetHighlight(checkbox, name, tracker != CheckState::Global);
QObject::connect(
checkbox, &QCheckBox::clicked, checkbox, [checkbox, name, global_state, &tracker]() {
tracker =
static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count);
QObject::connect(checkbox, &QCheckBox::clicked, checkbox,
[checkbox, name, global_state, &tracker]() {
tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
static_cast<int>(CheckState::Count));
if (tracker == CheckState::Global) {
checkbox->setChecked(global_state);
}

7
src/yuzu/configuration/configuration_shared.h
View File

@ -15,7 +15,7 @@ constexpr int USE_GLOBAL_INDEX = 0;
constexpr int USE_GLOBAL_SEPARATOR_INDEX = 1;
constexpr int USE_GLOBAL_OFFSET = 2;
enum CheckState {
enum class CheckState {
Off,
On,
Global,
@ -42,10 +42,9 @@ void SetPerGameSetting(QComboBox* combobox,
void SetHighlight(QWidget* widget, const std::string& name, bool highlighted);
void SetColoredTristate(QCheckBox* checkbox, const std::string& name,
const Settings::Setting<bool>& setting,
ConfigurationShared::CheckState& tracker);
const Settings::Setting<bool>& setting, CheckState& tracker);
void SetColoredTristate(QCheckBox* checkbox, const std::string& name, bool global, bool state,
bool global_state, ConfigurationShared::CheckState& tracker);
bool global_state, CheckState& tracker);
void SetColoredComboBox(QComboBox* combobox, QWidget* target, const std::string& target_name,
int global);