summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/config.cpp9
-rw-r--r--src/yuzu/configuration/config.h8
2 files changed, 11 insertions, 6 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 33d50667a..8c370ff91 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -745,8 +745,7 @@ void Config::ReadUIValues() {
745 UISettings::values.theme = 745 UISettings::values.theme =
746 ReadSetting( 746 ReadSetting(
747 QStringLiteral("theme"), 747 QStringLiteral("theme"),
748 QString::fromUtf8( 748 QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second))
749 UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second))
750 .toString(); 749 .toString();
751 ReadBasicSetting(UISettings::values.enable_discord_presence); 750 ReadBasicSetting(UISettings::values.enable_discord_presence);
752 ReadBasicSetting(UISettings::values.select_user_on_boot); 751 ReadBasicSetting(UISettings::values.select_user_on_boot);
@@ -1273,10 +1272,8 @@ void Config::SaveSystemValues() {
1273void Config::SaveUIValues() { 1272void Config::SaveUIValues() {
1274 qt_config->beginGroup(QStringLiteral("UI")); 1273 qt_config->beginGroup(QStringLiteral("UI"));
1275 1274
1276 WriteSetting( 1275 WriteSetting(QStringLiteral("theme"), UISettings::values.theme,
1277 QStringLiteral("theme"), UISettings::values.theme, 1276 QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second));
1278 QString::fromUtf8(
1279 UISettings::themes[static_cast<size_t>(UISettings::Theme::DarkColorful)].second));
1280 WriteBasicSetting(UISettings::values.enable_discord_presence); 1277 WriteBasicSetting(UISettings::values.enable_discord_presence);
1281 WriteBasicSetting(UISettings::values.select_user_on_boot); 1278 WriteBasicSetting(UISettings::values.select_user_on_boot);
1282 1279
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index d673c1cdc..8f4576def 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -48,6 +48,14 @@ public:
48 static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; 48 static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
49 static const std::array<UISettings::Shortcut, 21> default_hotkeys; 49 static const std::array<UISettings::Shortcut, 21> default_hotkeys;
50 50
51 static constexpr UISettings::Theme default_theme{
52#ifdef _WIN32
53 UISettings::Theme::DarkColorful
54#else
55 UISettings::Theme::DefaultColorful
56#endif
57 };
58
51private: 59private:
52 void Initialize(const std::string& config_name); 60 void Initialize(const std::string& config_name);
53 61