diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-04-08 18:48:02 +0200 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2023-04-08 18:48:05 +0200 |
commit | a9881115073cc73e668f14b23851914ddfa9b4e7 (patch) | |
tree | 3acd5ce23006b3a489633d06d993767f85e5c1d5 /launcher/ui/themes/ThemeManager.cpp | |
parent | ed085630db63401ac50d26403d953f5d9993b9ce (diff) | |
download | PrismLauncher-a9881115073cc73e668f14b23851914ddfa9b4e7.tar.gz PrismLauncher-a9881115073cc73e668f14b23851914ddfa9b4e7.tar.bz2 PrismLauncher-a9881115073cc73e668f14b23851914ddfa9b4e7.zip |
fix: do not apply system theme on launch
Closes PrismLauncher/PrismLauncher#490
Regression introduced by PrismLauncher/PrismLauncher#249
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/ui/themes/ThemeManager.cpp')
-rw-r--r-- | launcher/ui/themes/ThemeManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp index 13406485..94ac8a24 100644 --- a/launcher/ui/themes/ThemeManager.cpp +++ b/launcher/ui/themes/ThemeManager.cpp @@ -116,22 +116,22 @@ void ThemeManager::setIconTheme(const QString& name) QIcon::setThemeName(name); } -void ThemeManager::applyCurrentlySelectedTheme() +void ThemeManager::applyCurrentlySelectedTheme(bool initial) { setIconTheme(APPLICATION->settings()->get("IconTheme").toString()); themeDebugLog() << "<> Icon theme set."; - setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString()); + setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString(), initial); themeDebugLog() << "<> Application theme set."; } -void ThemeManager::setApplicationTheme(const QString& name) +void ThemeManager::setApplicationTheme(const QString& name, bool initial) { auto systemPalette = qApp->palette(); auto themeIter = m_themes.find(name); if (themeIter != m_themes.end()) { auto& theme = themeIter->second; themeDebugLog() << "applying theme" << theme->name(); - theme->apply(); + theme->apply(initial); } else { themeWarningLog() << "Tried to set invalid theme:" << name; } |