From 3331d2d0c28a7479ebcb0ad3197f42b1939bbdc1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 21 Mar 2024 10:19:44 +0100 Subject: [PATCH] respect skin settings bit more --- src/librssguard/miscellaneous/skinfactory.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index a87359cd1..91b4f38e1 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -141,7 +141,7 @@ void SkinFactory::loadSkinFromData(const Skin& skin) { } if (skin.m_defaultFont != QApplication::font()) { - QApplication::setFont(skin.m_defaultFont); + QGuiApplication::setFont(skin.m_defaultFont); qDebugNN << "Activating custom application default font" << QUOTE_W_SPACE_DOT(skin.m_defaultFont.toString()); } @@ -176,8 +176,8 @@ void SkinFactory::loadSkinFromData(const Skin& skin) { m_useSkinColors = skin.m_forcedSkinColors || qApp->settings()->value(GROUP(GUI), SETTING(GUI::ForcedSkinColors)).toBool(); - if (isStyleGoodForAlternativeStylePalette(m_currentStyle)) { - if (!skin.m_stylePalette.isEmpty() && m_useSkinColors) { + if (m_useSkinColors && isStyleGoodForAlternativeStylePalette(m_currentStyle)) { + if (!skin.m_stylePalette.isEmpty()) { qDebugNN << LOGSEC_GUI << "Activating alternative palette."; QPalette pal = skin.extractPalette(); @@ -195,8 +195,8 @@ void SkinFactory::loadSkinFromData(const Skin& skin) { #endif } - if (!skin.m_rawData.isEmpty()) { - if (qApp->styleSheet().simplified().isEmpty() && m_useSkinColors) { + if (m_useSkinColors && !skin.m_rawData.isEmpty()) { + if (qApp->styleSheet().simplified().isEmpty()) { qApp->setStyleSheet(skin.m_rawData); } else {