yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

uisettings: Add enumeration type for themes 

Eliminates the usage of a magic number to indicate the default index of the themes array,
This commit is contained in:
Morph 2022-01-17 02:46:30 -05:00
parent 789af19c60
commit 78e233c460
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/yuzu/configuration/config.cpp
View File

@ -743,7 +743,10 @@ void Config::ReadUIValues() {
qt_config->beginGroup(QStringLiteral("UI")); qt_config->beginGroup(QStringLiteral("UI"));
UISettings::values.theme = UISettings::values.theme =
ReadSetting(QStringLiteral("theme"), QString::fromUtf8(UISettings::themes[3].second)) ReadSetting(
QStringLiteral("theme"),
QString::fromUtf8(
UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second))
.toString(); .toString();
ReadBasicSetting(UISettings::values.enable_discord_presence); ReadBasicSetting(UISettings::values.enable_discord_presence);
ReadBasicSetting(UISettings::values.select_user_on_boot); ReadBasicSetting(UISettings::values.select_user_on_boot);
@ -1270,8 +1273,10 @@ void Config::SaveSystemValues() {
void Config::SaveUIValues() { void Config::SaveUIValues() {
qt_config->beginGroup(QStringLiteral("UI")); qt_config->beginGroup(QStringLiteral("UI"));
WriteSetting(QStringLiteral("theme"), UISettings::values.theme, WriteSetting(
QString::fromUtf8(UISettings::themes[3].second)); QStringLiteral("theme"), UISettings::values.theme,
QString::fromUtf8(
UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second));
WriteBasicSetting(UISettings::values.enable_discord_presence); WriteBasicSetting(UISettings::values.enable_discord_presence);
WriteBasicSetting(UISettings::values.select_user_on_boot); WriteBasicSetting(UISettings::values.select_user_on_boot);

9
src/yuzu/uisettings.h
View File

@ -29,6 +29,15 @@ struct Shortcut {
ContextualShortcut shortcut; ContextualShortcut shortcut;
}; };
enum class Theme {
Default,
DefaultColorful,
Dark,
DarkColorful,
MidnightBlue,
MidnightBlueColorful,
};
using Themes = std::array<std::pair<const char*, const char*>, 6>; using Themes = std::array<std::pair<const char*, const char*>, 6>;
extern const Themes themes; extern const Themes themes;