yuzu-emu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-11-23 02:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

configuration_shared: Require name of the widget for highlighting

Browse Source 
Prevents mass-coloring of elements later on
This commit is contained in:
lat9nq 2020-07-13 19:22:41 -04:00
parent 5a9dc8f002
commit da65b92f9e
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QObject> #include <QObject>
#include <QString>
#include "core/settings.h" #include "core/settings.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_per_game.h" #include "yuzu/configuration/configure_per_game.h"
@ -85,30 +86,37 @@ void ConfigurationShared::SetPerGameSetting(
ConfigurationShared::USE_GLOBAL_OFFSET); ConfigurationShared::USE_GLOBAL_OFFSET);
} }
void ConfigurationShared::SetHighlight(QWidget* widget, bool highlighted) { void ConfigurationShared::SetHighlight(QWidget* widget, const std::string& name, bool highlighted) {
if (highlighted) { if (highlighted) {
widget->setStyleSheet(QStringLiteral("border:2px solid;border-color:rgba(0,203,255,0.5);")); widget->setStyleSheet(
QStringLiteral("QWidget#%1 { border:2px solid;border-color:rgba(0,203,255,0.5) }")
.arg(QString::fromStdString(name)));
} else { } else {
widget->setStyleSheet(QStringLiteral("border:2px solid;border-color:rgba(0,0,0,0);")); widget->setStyleSheet(
QStringLiteral("QWidget#%1 { border:2px solid;border-color:rgba(0,0,0,0) }")
.arg(QString::fromStdString(name)));
} }
widget->show(); widget->show();
} }
void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, Settings::Setting<bool>& setting, void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::string& name,
const Settings::Setting<bool>& setting,
ConfigurationShared::CheckState& tracker) { ConfigurationShared::CheckState& tracker) {
if (setting.UsingGlobal()) { if (setting.UsingGlobal()) {
tracker = CheckState::Global; tracker = CheckState::Global;
} else { } else {
tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off; tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off;
} }
SetHighlight(checkbox, tracker != CheckState::Global); SetHighlight(checkbox, name, tracker != CheckState::Global);
QObject::connect(checkbox, &QCheckBox::clicked, checkbox, [checkbox, setting, &tracker]() { QObject::connect(
tracker = static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count); checkbox, &QCheckBox::clicked, checkbox, [checkbox, name, setting, &tracker]() {
if (tracker == CheckState::Global) { tracker =
checkbox->setChecked(setting.GetValue(true)); static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count);
} if (tracker == CheckState::Global) {
SetHighlight(checkbox, tracker != CheckState::Global); checkbox->setChecked(setting.GetValue(true));
}); }
SetHighlight(checkbox, name, tracker != CheckState::Global);
});
} }
void ConfigurationShared::InsertGlobalItem(QComboBox* combobox) { void ConfigurationShared::InsertGlobalItem(QComboBox* combobox) {

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

@ -25,6 +25,8 @@ enum CheckState {
struct Trackers { struct Trackers {
CheckState use_frame_limit; CheckState use_frame_limit;
CheckState use_multi_core; CheckState use_multi_core;
CheckState enable_audio_stretching;
} extern trackers; } extern trackers;
// Global-aware apply and set functions // Global-aware apply and set functions
@ -45,8 +47,8 @@ void SetPerGameSetting(QComboBox* combobox,
void SetPerGameSetting(QComboBox* combobox, void SetPerGameSetting(QComboBox* combobox,
const Settings::Setting<Settings::GPUAccuracy>* setting); const Settings::Setting<Settings::GPUAccuracy>* setting);
void SetHighlight(QWidget* widget, bool highlighted); void SetHighlight(QWidget* widget, const std::string& name, bool highlighted);
void SetColoredTristate(QCheckBox* checkbox, Settings::Setting<bool>& setting, void SetColoredTristate(QCheckBox* checkbox, const std::string& name, const Settings::Setting<bool>& setting,
ConfigurationShared::CheckState& tracker); ConfigurationShared::CheckState& tracker);
void InsertGlobalItem(QComboBox* combobox); void InsertGlobalItem(QComboBox* combobox);

5
src/yuzu/configuration/configure_general.cpp
View File

@ -108,10 +108,11 @@ void ConfigureGeneral::SetupPerGameUI() {
ui->toggle_background_pause->setVisible(false); ui->toggle_background_pause->setVisible(false);
ui->toggle_hide_mouse->setVisible(false); ui->toggle_hide_mouse->setVisible(false);
ConfigurationShared::SetColoredTristate(ui->toggle_frame_limit, ConfigurationShared::SetColoredTristate(ui->toggle_frame_limit, "toggle_frame_limit",
Settings::values.use_frame_limit, Settings::values.use_frame_limit,
ConfigurationShared::trackers.use_frame_limit); ConfigurationShared::trackers.use_frame_limit);
ConfigurationShared::SetColoredTristate(ui->use_multi_core, Settings::values.use_multi_core, ConfigurationShared::SetColoredTristate(ui->use_multi_core, "use_multi_core",
Settings::values.use_multi_core,
ConfigurationShared::trackers.use_multi_core); ConfigurationShared::trackers.use_multi_core);
connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() { connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() {