pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

respect skin settings bit more

Browse source
This commit is contained in:
Martin Rotter 2024-03-21 10:19:44 +01:00
parent b18ba28d6f
commit 3331d2d0c2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librssguard/miscellaneous/skinfactory.cpp
View file

@ -141,7 +141,7 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
} }
if (skin.m_defaultFont != QApplication::font()) { 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()); 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 = m_useSkinColors =
skin.m_forcedSkinColors || qApp->settings()->value(GROUP(GUI), SETTING(GUI::ForcedSkinColors)).toBool(); skin.m_forcedSkinColors || qApp->settings()->value(GROUP(GUI), SETTING(GUI::ForcedSkinColors)).toBool();
if (isStyleGoodForAlternativeStylePalette(m_currentStyle)) { if (m_useSkinColors && isStyleGoodForAlternativeStylePalette(m_currentStyle)) {
if (!skin.m_stylePalette.isEmpty() && m_useSkinColors) { if (!skin.m_stylePalette.isEmpty()) {
qDebugNN << LOGSEC_GUI << "Activating alternative palette."; qDebugNN << LOGSEC_GUI << "Activating alternative palette.";
QPalette pal = skin.extractPalette(); QPalette pal = skin.extractPalette();
@ -195,8 +195,8 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
#endif #endif
} }
if (!skin.m_rawData.isEmpty()) { if (m_useSkinColors && !skin.m_rawData.isEmpty()) {
if (qApp->styleSheet().simplified().isEmpty() && m_useSkinColors) { if (qApp->styleSheet().simplified().isEmpty()) {
qApp->setStyleSheet(skin.m_rawData); qApp->setStyleSheet(skin.m_rawData);
} }
else { else {