FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-14 09:37:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

change order of loading of palette and qss

Browse Source
This commit is contained in:
Martin Rotter 2021-11-12 10:08:08 +01:00
parent 9aad7e8789
commit f4cbe5199b
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/librssguard/miscellaneous/skinfactory.cpp
View File

@ -47,16 +47,6 @@ bool SkinFactory::isStyleGoodForDarkVariant(const QString& style_name) const {
} }
void SkinFactory::loadSkinFromData(const Skin& skin) { void SkinFactory::loadSkinFromData(const Skin& skin) {
if (!skin.m_rawData.isEmpty()) {
if (qApp->styleSheet().simplified().isEmpty()) {
qApp->setStyleSheet(skin.m_rawData);
}
else {
qCriticalNN << LOGSEC_GUI
<< "Skipped setting of application style and skin because there is already some style set.";
}
}
QString style_name = qApp->settings()->value(GROUP(GUI), SETTING(GUI::Style)).toString(); QString style_name = qApp->settings()->value(GROUP(GUI), SETTING(GUI::Style)).toString();
qApp->setStyle(style_name); qApp->setStyle(style_name);
@ -85,7 +75,7 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
fusion_palette.setColor(QPalette::ColorRole::Dark, clr_bg); fusion_palette.setColor(QPalette::ColorRole::Dark, clr_bg);
fusion_palette.setColor(QPalette::ColorRole::AlternateBase, clr_altbg); fusion_palette.setColor(QPalette::ColorRole::AlternateBase, clr_altbg);
fusion_palette.setColor(QPalette::ColorRole::Button, clr_altbg); fusion_palette.setColor(QPalette::ColorRole::Button, clr_altbg);
fusion_palette.setColor(QPalette::ColorRole::Highlight, clr_selbg); fusion_palette.setColor(QPalette::ColorRole::Highlight, Qt::GlobalColor::blue);
// Texts. // Texts.
fusion_palette.setColor(QPalette::ColorRole::WindowText, clr_fg); fusion_palette.setColor(QPalette::ColorRole::WindowText, clr_fg);
@ -97,6 +87,14 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
fusion_palette.setColor(QPalette::ColorRole::LinkVisited, clr_link); fusion_palette.setColor(QPalette::ColorRole::LinkVisited, clr_link);
fusion_palette.setColor(QPalette::ColorRole::HighlightedText, clr_fg); fusion_palette.setColor(QPalette::ColorRole::HighlightedText, clr_fg);
//
// Inactive state.
//
// Backgrounds & bases.
// Texts.
// //
// Disabled state. // Disabled state.
// //
@ -129,6 +127,16 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
QToolTip::setPalette(fusion_palette); QToolTip::setPalette(fusion_palette);
qApp->setPalette(fusion_palette); qApp->setPalette(fusion_palette);
} }
if (!skin.m_rawData.isEmpty()) {
if (qApp->styleSheet().simplified().isEmpty()) {
qApp->setStyleSheet(skin.m_rawData);
}
else {
qCriticalNN << LOGSEC_GUI
<< "Skipped setting of application style and skin because there is already some style set.";
}
}
} }
void SkinFactory::setCurrentSkinName(const QString& skin_name) { void SkinFactory::setCurrentSkinName(const QString& skin_name) {