From efe3c3f8db07319edd13543a6a8e8c6f4ef8ba35 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 26 Nov 2021 07:34:14 +0100 Subject: [PATCH] respech "enabled" check in custom colors --- src/librssguard/miscellaneous/skinfactory.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index 46ddfabd7..b90f6185d 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -330,12 +330,17 @@ uint qHash(const SkinEnums::PaletteColors& key) { QVariant Skin::colorForModel(SkinEnums::PaletteColors type, bool ignore_custom_colors) const { if (!ignore_custom_colors) { - const QMetaObject& mo = SkinEnums::staticMetaObject; - QMetaEnum enumer = mo.enumerator(mo.indexOfEnumerator(QSL("PaletteColors").toLocal8Bit().constData())); - QColor custom_clr = qApp->settings()->value(GROUP(CustomSkinColors), enumer.valueToKey(int(type))).toString(); + bool enabled = qApp->settings()->value(GROUP(CustomSkinColors), + SETTING(CustomSkinColors::Enabled)).toBool(); - if (custom_clr.isValid()) { - return custom_clr; + if (enabled) { + const QMetaObject& mo = SkinEnums::staticMetaObject; + QMetaEnum enumer = mo.enumerator(mo.indexOfEnumerator(QSL("PaletteColors").toLocal8Bit().constData())); + QColor custom_clr = qApp->settings()->value(GROUP(CustomSkinColors), enumer.valueToKey(int(type))).toString(); + + if (custom_clr.isValid()) { + return custom_clr; + } } }