Mirror-bot/quickshell
1
0 Fork 0
mirror of https://github.com/quickshell-mirror/quickshell.git synced 2026-10-27 02:54:36 +00:00
Code Issues Projects Releases Activity

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 committed 2026-04-04 12:28:40 -07:00
1 parent 854088c48c
commit 9b98d10178
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/io/jsonadapter.cpp
+11 -5
View File
@@ -136,13 +136,19 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
} else {
if (val.canConvert<QJSValue>()) val = val.value<QJSValue>().toVariant();
if (val.canConvert<QAssociativeIterable>()) {
val.convert(QMetaType::fromType<QVariantMap>());
} else if (val.canConvert<QSequentialIterable>()) {
val.convert(QMetaType::fromType<QVariantList>());
auto jsonVal = QJsonValue::fromVariant(val);
if (jsonVal.isNull() && !val.isNull() && val.isValid()) {
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);
}
}
}