respech "enabled" check in custom colors
This commit is contained in:
parent
637411a0d6
commit
efe3c3f8db
1 changed files with 10 additions and 5 deletions
|
@ -330,12 +330,17 @@ uint qHash(const SkinEnums::PaletteColors& key) {
|
||||||
|
|
||||||
QVariant Skin::colorForModel(SkinEnums::PaletteColors type, bool ignore_custom_colors) const {
|
QVariant Skin::colorForModel(SkinEnums::PaletteColors type, bool ignore_custom_colors) const {
|
||||||
if (!ignore_custom_colors) {
|
if (!ignore_custom_colors) {
|
||||||
const QMetaObject& mo = SkinEnums::staticMetaObject;
|
bool enabled = qApp->settings()->value(GROUP(CustomSkinColors),
|
||||||
QMetaEnum enumer = mo.enumerator(mo.indexOfEnumerator(QSL("PaletteColors").toLocal8Bit().constData()));
|
SETTING(CustomSkinColors::Enabled)).toBool();
|
||||||
QColor custom_clr = qApp->settings()->value(GROUP(CustomSkinColors), enumer.valueToKey(int(type))).toString();
|
|
||||||
|
|
||||||
if (custom_clr.isValid()) {
|
if (enabled) {
|
||||||
return custom_clr;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue