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

core/scriptmodel: avoid comparing native types as equal by fields

Browse Source
This commit is contained in:
outfoxxed committed 2026-09-15 01:37:42 -07:00
1 parent 86b4275879
commit c6a516096d
1 file changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/core/scriptmodel.cpp
+8 -1
View File
@@ -27,7 +27,14 @@ bool qjsValueStructuralEq(
const RecursionPair* activePair = nullptr
) {
if (a.strictlyEquals(b)) return true;
if (!a.isObject() || !b.isObject() || a.isArray() != b.isArray()) return false;
const auto jsValueType = QMetaType::fromType<QJSValue>();
const auto aIsNative = a.toVariant(QJSValue::RetainJSObjects).metaType() != jsValueType;
const auto bIsNative = b.toVariant(QJSValue::RetainJSObjects).metaType() != jsValueType;
if (aIsNative || bIsNative) return false;
if (!a.isObject() || !b.isObject() || a.isCallable() || b.isCallable()) return false;
if (a.isArray() != b.isArray()) return false;
for (const auto* pair = activePair; pair != nullptr; pair = pair->previous) {
if (a.strictlyEquals(*pair->a) || b.strictlyEquals(*pair->b)) return false;