From 9f6eb972b7dccbefe86c1aae5fa3e0499da35318 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Fri, 16 Oct 2020 11:32:21 +0200 Subject: [PATCH] QmlDesigner: Fix reversed order on Navigator drop Task-number: QDS-2910 Change-Id: Iab58b79b6f3cdb3f922824a7f608b633b019c9ae Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/navigator/navigatortreemodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 78d38c082d7..602a0f73164 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -770,7 +770,8 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProper auto doMoveNodesInteractive = [&parentProperty, modelNodes, targetIndex](){ const TypeName propertyQmlType = parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name()); - foreach (const ModelNode &modelNode, modelNodes) { + int idx = targetIndex; + for (const ModelNode &modelNode : modelNodes) { if (modelNode.isValid() && modelNode != parentProperty.parentModelNode() && !modelNode.isAncestorOf(parentProperty.parentModelNode()) @@ -779,10 +780,9 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProper //once the MetaInfo is part of instances we can do this right bool nodeCanBeMovedToParentProperty = removeModelNodeFromNodeProperty(parentProperty, modelNode); - if (nodeCanBeMovedToParentProperty) { reparentModelNodeToNodeProperty(parentProperty, modelNode); - slideModelNodeInList(parentProperty, modelNode, targetIndex); + slideModelNodeInList(parentProperty, modelNode, idx++); } } }