From 9ca5b7fea2e4d13591360d7b4cf3debe19325101 Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Thu, 21 Dec 2023 19:03:18 +0200 Subject: [PATCH] QmlDesigner: Fix cells' unpredictable yellow outlines Task-number: QDS-11573 Change-Id: I00a57e39804e54ce2fc25f4430975267c61a953a Reviewed-by: Ali Kianian Reviewed-by: Miikka Heikkinen --- .../components/collectioneditor/collectiondetails.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp index 98eef0daea2..4cc6717d914 100644 --- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp +++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp @@ -351,8 +351,15 @@ CollectionDetails::DataType CollectionDetails::typeAt(int row, int column) const DataTypeWarning::Warning CollectionDetails::cellWarningCheck(int row, int column) const { - if (typeAt(column) != typeAt(row, column) && !d->elements.at(row).isEmpty()) + const QString &propertyName = d->properties.at(column).name; + const QJsonObject &element = d->elements.at(row); + + if (element.isEmpty()) + return DataTypeWarning::Warning::None; + + if (element.contains(propertyName) && typeAt(column) != typeAt(row, column)) return DataTypeWarning::Warning::CellDataTypeMismatch; + return DataTypeWarning::Warning::None; }