aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-04-10 06:11:54 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

io/fileview: try to convert values to json before handling sequences

Browse source 
The previous code was interpreting a string as a list of characters
and therefore a sequence.
This commit is contained in:
outfoxxed 2026-04-04 12:28:40 -07:00
parent 854088c48c
commit 9b98d10178
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/io/jsonadapter.cpp
View file

@ -136,13 +136,19 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
} else { } else {
if (val.canConvert<QJSValue>()) val = val.value<QJSValue>().toVariant(); if (val.canConvert<QJSValue>()) val = val.value<QJSValue>().toVariant();
if (val.canConvert<QAssociativeIterable>()) { auto jsonVal = QJsonValue::fromVariant(val);
val.convert(QMetaType::fromType<QVariantMap>());
} else if (val.canConvert<QSequentialIterable>()) { if (jsonVal.isNull() && !val.isNull() && val.isValid()) {
val.convert(QMetaType::fromType<QVariantList>()); if (val.canConvert<QAssociativeIterable>()) {
val.convert(QMetaType::fromType<QVariantMap>());
} else if (val.canConvert<QSequentialIterable>()) {
val.convert(QMetaType::fromType<QVariantList>());
}
jsonVal = QJsonValue::fromVariant(val);
} }
json.insert(prop.name(), QJsonValue::fromVariant(val)); json.insert(prop.name(), jsonVal);
} }
} }
} }