ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Use correct colours for all system themes

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f08478c7ece0cd4e13b0bc188d0dcb9ea04c3199)
This commit is contained in:
TheKodeToad 2025-03-23 14:17:43 +00:00 committed by github-actions[bot]
parent 57981a070f
commit 57120e0c9d
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
launcher/ui/themes/SystemTheme.cpp
View File

@ -40,23 +40,11 @@
#include "HintOverrideProxyStyle.h"
#include "ThemeManager.h"
SystemTheme::SystemTheme(const QString& styleName, const QPalette& palette, bool isDefaultTheme)
SystemTheme::SystemTheme(const QString& styleName, bool isDefaultTheme)
{
themeName = isDefaultTheme ? "system" : styleName;
widgetTheme = styleName;
colorPalette = palette;
}
void SystemTheme::apply(bool initial)
{
// See https://github.com/MultiMC/Launcher/issues/1790
// or https://github.com/PrismLauncher/PrismLauncher/issues/490
if (initial) {
QApplication::setStyle(new HintOverrideProxyStyle(QStyleFactory::create(qtTheme())));
return;
}
ITheme::apply(initial);
colorPalette = QStyleFactory::create(styleName)->standardPalette();
}
QString SystemTheme::id()

3
launcher/ui/themes/SystemTheme.h
View File

@ -38,9 +38,8 @@
class SystemTheme : public ITheme {
public:
SystemTheme(const QString& styleName, const QPalette& palette, bool isDefaultTheme);
SystemTheme(const QString& styleName, bool isDefaultTheme);
virtual ~SystemTheme() {}
void apply(bool initial) override;
QString id() override;
QString name() override;

6
launcher/ui/themes/ThemeManager.cpp
View File

@ -44,8 +44,6 @@ ThemeManager::ThemeManager()
m_defaultStyle = style->objectName();
themeDebugLog() << "System theme seems to be:" << m_defaultStyle;
m_defaultPalette = QApplication::palette();
initializeThemes();
initializeCatPacks();
}
@ -128,7 +126,7 @@ void ThemeManager::initializeIcons()
void ThemeManager::initializeWidgets()
{
themeDebugLog() << "<> Initializing Widget Themes";
themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(m_defaultStyle, m_defaultPalette, true));
themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(m_defaultStyle, true));
auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
@ -141,7 +139,7 @@ void ThemeManager::initializeWidgets()
continue;
}
#endif
themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st, m_defaultPalette, false));
themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st, false));
}
// TODO: need some way to differentiate same name themes in different subdirectories

1
launcher/ui/themes/ThemeManager.h
View File

@ -69,7 +69,6 @@ class ThemeManager {
QDir m_catPacksFolder{ "catpacks" };
std::map<QString, std::unique_ptr<CatPack>> m_catPacks;
QString m_defaultStyle;
QPalette m_defaultPalette;
LogColors m_logColors;
void initializeThemes();