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: use QVariant when QJSValue cast fails in adapter prop read

Browse source 
A QVariant(QVariantMap) does not convert implicitly to a
QVaraint(QJSValue), causing extra signals to be emitted if the old
value was not updated by js (replaced by a QJSValue) before
deserializing again.
This commit is contained in:
outfoxxed 2026-04-03 21:30:05 -07:00
parent aaff22f4b0
commit ceac3c6cfa
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog/next.md
View file

@ -67,6 +67,7 @@ set shell id.
- Fixed HyprlandFocusGrab crashing if windows were destroyed after being passed to it. - Fixed HyprlandFocusGrab crashing if windows were destroyed after being passed to it.
- Fixed ScreencopyView pixelation when scaled. - Fixed ScreencopyView pixelation when scaled.
- Fixed JsonAdapter crashing and providing bad data on read when using JsonObject. - Fixed JsonAdapter crashing and providing bad data on read when using JsonObject.
- Fixed JsonAdapter sending unnecessary property changes for primitive values.
## Packaging Changes ## Packaging Changes

10
src/io/jsonadapter.cpp
View file

@ -154,13 +154,15 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
auto jval = json.value(prop.name()); auto jval = json.value(prop.name());
if (prop.metaType() == QMetaType::fromType<QVariant>()) { if (prop.metaType() == QMetaType::fromType<QVariant>()) {
auto variant = jval.toVariant(); auto newVariant = jval.toVariant();
auto oldValue = prop.read(obj).value<QJSValue>(); auto oldValue = prop.read(obj);
auto oldVariant =
oldValue.canConvert<QJSValue>() ? oldValue.value<QJSValue>().toVariant() : oldValue;
// Calling prop.write with a new QJSValue will cause a property update // Calling prop.write with a new QJSValue will cause a property update
// even if content is identical. // even if content is identical.
if (jval.toVariant() != oldValue.toVariant()) { if (newVariant != oldVariant) {
auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(jval.toVariant()); auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(newVariant);
prop.write(obj, QVariant::fromValue(jsValue)); prop.write(obj, QVariant::fromValue(jsValue));
} }
} else if (QMetaType::canView(prop.metaType(), QMetaType::fromType<JsonObject*>())) { } else if (QMetaType::canView(prop.metaType(), QMetaType::fromType<JsonObject*>())) {