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

QmlDesigner: Delete existing node when property does not allow list

Browse Source 
Some properties can only contain a single QML element. In this case
we should delete the old existing element.

This can be checked using NodeMetainfo::propertyIsListProperty.

Change-Id: I1782a38b7bfdb8a6f1078b0fa39654a4653dab59
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-10-05 12:04:34 +02:00
parent 35ffc930b8
commit aeb30c0840
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp
View File

@@ -213,11 +213,20 @@ QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view,
NodeHints hints = NodeHints::fromItemLibraryEntry(itemLibraryEntry); NodeHints hints = NodeHints::fromItemLibraryEntry(itemLibraryEntry);
const PropertyName forceNonDefaultProperty = hints.forceNonDefaultProperty().toUtf8(); const PropertyName forceNonDefaultProperty = hints.forceNonDefaultProperty().toUtf8();
QmlObjectNode newNode = QmlItemNode::createQmlObjectNode(view, itemLibraryEntry, position, parentProperty); QmlObjectNode newNode = QmlItemNode::createQmlObjectNode(view,
itemLibraryEntry,
position,
parentProperty);
if (!forceNonDefaultProperty.isEmpty()) { if (!forceNonDefaultProperty.isEmpty()) {
if (parentQmlItemNode.modelNode().metaInfo().hasProperty(forceNonDefaultProperty)) const NodeMetaInfo metaInfo = parentQmlItemNode.modelNode().metaInfo();
if (metaInfo.hasProperty(forceNonDefaultProperty)) {
if (!metaInfo.propertyIsListProperty(forceNonDefaultProperty)
&& parentQmlItemNode.modelNode().hasNodeProperty(forceNonDefaultProperty)) {
parentQmlItemNode.removeProperty(forceNonDefaultProperty);
}
parentQmlItemNode.nodeListProperty(forceNonDefaultProperty).reparentHere(newNode); parentQmlItemNode.nodeListProperty(forceNonDefaultProperty).reparentHere(newNode);
}
} }
return newNode; return newNode;
@@ -288,8 +297,18 @@ QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view,
newQmlObjectNode = createQmlObjectNodeFromSource(view, itemLibraryEntry.qmlSource(), position); newQmlObjectNode = createQmlObjectNodeFromSource(view, itemLibraryEntry.qmlSource(), position);
} }
if (parentProperty.isValid()) if (parentProperty.isValid()) {
parentProperty.reparentHere(newQmlObjectNode); const PropertyName propertyName = parentProperty.name();
const ModelNode parentNode = parentProperty.parentModelNode();
const NodeMetaInfo metaInfo = parentNode.metaInfo();
if (metaInfo.isValid() && !metaInfo.propertyIsListProperty(propertyName)
&& parentProperty.isNodeProperty()) {
parentNode.removeProperty(propertyName);
}
parentNode.nodeAbstractProperty(propertyName).reparentHere(newQmlObjectNode);
}
if (!newQmlObjectNode.isValid()) if (!newQmlObjectNode.isValid())
return; return;