dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GH-1790 do not apply system theme on launch if it is selected

Browse source 
This prevents some ugly colors to show up on macOS in most cases.
It still looks ugly right after you switch to the it though.
This commit is contained in:
Petr Mrázek 2017-01-18 02:45:04 +01:00
parent 201d4ac317
commit ceb5fc6d75
7 changed files with 44 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
application/MultiMC.cpp
View file

@ -355,7 +355,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
connect(this, SIGNAL(aboutToQuit()), SLOT(onExit()));
setIconTheme(settings()->get("IconTheme").toString());
setApplicationTheme(settings()->get("ApplicationTheme").toString());
setApplicationTheme(settings()->get("ApplicationTheme").toString(), true);
initAnalytics();
@ -868,27 +868,14 @@ void MultiMC::initThemes()
insertTheme(new CustomTheme(darkTheme, "custom"));
}
void MultiMC::setApplicationTheme(const QString& name)
void MultiMC::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;
setStyle(QStyleFactory::create(theme->qtTheme()));
if(theme->hasColorScheme())
{
setPalette(theme->colorScheme());
}
if(theme->hasStyleSheet())
{
setStyleSheet(theme->appStyleSheet());
}
else
{
setStyleSheet(QString());
}
QDir::setSearchPaths("theme", theme->searchPaths());
theme->apply(initial);
}
else
{