diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-01-15 22:56:03 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-01-15 22:56:03 +0100 |
| commit | 944ff256b2d9e271632efacd6e8dd1ea542e869f (patch) | |
| tree | af7fc0041d8cc28d86577c9ffa6fc438a21b9a0b /application/MultiMC.cpp | |
| parent | 71584fb8ccda914997f11044e819470d93cc3561 (diff) | |
| download | MultiMC-944ff256b2d9e271632efacd6e8dd1ea542e869f.tar MultiMC-944ff256b2d9e271632efacd6e8dd1ea542e869f.tar.gz MultiMC-944ff256b2d9e271632efacd6e8dd1ea542e869f.tar.lz MultiMC-944ff256b2d9e271632efacd6e8dd1ea542e869f.tar.xz MultiMC-944ff256b2d9e271632efacd6e8dd1ea542e869f.zip | |
NOISSUE add hack for system themes. Maybe it works?
Diffstat (limited to 'application/MultiMC.cpp')
| -rw-r--r-- | application/MultiMC.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 5bc3e79c..8e924d98 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -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()); initAnalytics(); @@ -876,9 +876,19 @@ void MultiMC::setApplicationTheme(const QString& name) { auto & theme = (*themeIter).second; setStyle(QStyleFactory::create(theme->qtTheme())); - setPalette(theme->colorScheme()); + if(theme->hasColorScheme()) + { + setPalette(theme->colorScheme()); + } + if(theme->hasStyleSheet()) + { + setStyleSheet(theme->appStyleSheet()); + } + else + { + setStyleSheet(QString()); + } QDir::setSearchPaths("theme", theme->searchPaths()); - setStyleSheet(theme->appStyleSheet()); } else { |