feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix cells' unpredictable yellow outlines

Browse Source 
Task-number: QDS-11573
Change-Id: I00a57e39804e54ce2fc25f4430975267c61a953a
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Shrief Gabr
2023-12-21 19:03:18 +02:00
parent 6e75d21f84
commit 9ca5b7fea2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp
View File

@@ -351,8 +351,15 @@ CollectionDetails::DataType CollectionDetails::typeAt(int row, int column) const
DataTypeWarning::Warning CollectionDetails::cellWarningCheck(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::CellDataTypeMismatch;
return DataTypeWarning::Warning::None; return DataTypeWarning::Warning::None;
} }