N-archive/suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7755 from v1993/someone-in-here-lacks-system-wide-theming

Browse source 
Use Default Colorful theme by default outside of Windows
This commit is contained in:
bunnei 2022-01-21 11:51:29 -08:00 committed by GitHub
commit 88d9b55b14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yuzu/configuration/config.cpp
View file

@ -745,8 +745,7 @@ void Config::ReadUIValues() {
UISettings::values.theme = UISettings::values.theme =
ReadSetting( ReadSetting(
QStringLiteral("theme"), QStringLiteral("theme"),
QString::fromUtf8( QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second))
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);
@ -1273,10 +1272,8 @@ void Config::SaveSystemValues() {
void Config::SaveUIValues() { void Config::SaveUIValues() {
qt_config->beginGroup(QStringLiteral("UI")); qt_config->beginGroup(QStringLiteral("UI"));
WriteSetting( WriteSetting(QStringLiteral("theme"), UISettings::values.theme,
QStringLiteral("theme"), UISettings::values.theme, QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second));
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);

8
src/yuzu/configuration/config.h
View file

@ -48,6 +48,14 @@ public:
static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
static const std::array<UISettings::Shortcut, 21> default_hotkeys; static const std::array<UISettings::Shortcut, 21> default_hotkeys;
static constexpr UISettings::Theme default_theme{
#ifdef _WIN32
UISettings::Theme::DarkColorful
#else
UISettings::Theme::DefaultColorful
#endif
};
private: private:
void Initialize(const std::string& config_name); void Initialize(const std::string& config_name);