diff --git a/src/app/application.cpp b/src/app/application.cpp index f1ff45841..9a8866086 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -615,7 +615,6 @@ int Application::exec(const QStringList ¶ms) #else UIThemeManager::initInstance(); m_window = new MainWindow; - UIThemeManager::instance()->applyStyleSheet(); #endif // DISABLE_GUI m_running = true; diff --git a/src/gui/uithememanager.cpp b/src/gui/uithememanager.cpp index a48656744..92fd26ba2 100644 --- a/src/gui/uithememanager.cpp +++ b/src/gui/uithememanager.cpp @@ -88,6 +88,7 @@ UIThemeManager::UIThemeManager() else { loadColorsFromJSONConfig(); applyPalette(); + applyStyleSheet(); } } } @@ -99,11 +100,6 @@ UIThemeManager *UIThemeManager::instance() void UIThemeManager::applyStyleSheet() const { - if (!m_useCustomTheme) { - qApp->setStyleSheet({}); - return; - } - QFile qssFile(":uitheme/stylesheet.qss"); if (!qssFile.open(QIODevice::ReadOnly | QIODevice::Text)) { qApp->setStyleSheet({}); diff --git a/src/gui/uithememanager.h b/src/gui/uithememanager.h index e2580b78b..6c23a9f21 100644 --- a/src/gui/uithememanager.h +++ b/src/gui/uithememanager.h @@ -45,8 +45,6 @@ public: static void freeInstance(); static UIThemeManager *instance(); - void applyStyleSheet() const; - QString getIconPath(const QString &iconId) const; QIcon getIcon(const QString &iconId, const QString &fallback = {}) const; QIcon getFlagIcon(const QString &countryIsoCode) const; @@ -58,6 +56,7 @@ private: QString getIconPathFromResources(const QString &iconId, const QString &fallback = {}) const; void loadColorsFromJSONConfig(); void applyPalette() const; + void applyStyleSheet() const; static UIThemeManager *m_instance; QHash m_colors;