From ecefef03735e2cb58b558699ef480d67250a4697 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 8 Mar 2011 18:33:38 +0100
Subject: [PATCH] QmlDesigner.navigator: better support for positioners
The properties x and y get removed when putting an item
into an positioner.
---
.../components/navigator/navigatortreemodel.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index b6eab6a264d..7e22888a42f 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -529,7 +529,16 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentPropert
}
}
- parentProperty.reparentHere(node);
+ if (parentProperty.isDefaultProperty() && parentProperty.parentModelNode().metaInfo().isSubclassOf("QtQuick.QDeclarativeBasePositioner", -1, -1)) {
+ ModelNode currentNode = node;
+ if (currentNode.hasProperty("x"))
+ currentNode.removeProperty("x");
+ if (currentNode.hasProperty("y"))
+ currentNode.removeProperty("y");
+ parentProperty.reparentHere(currentNode);
+ } else {
+ parentProperty.reparentHere(node);
+ }
}
if (parentProperty.isNodeListProperty()) {
--
GitLab