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

QmlDesigner: Refactor clear position code in NavigatorTreeModel

Browse Source 
Change-Id: Ib2866296c03db0ab8866a3b99761ef83c5000884
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Marco Bubke
2014-04-23 16:22:02 +02:00
parent 406d50438d
commit a599ea57ef
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -490,6 +490,15 @@ void NavigatorTreeModel::removeSubTree(const ModelNode &node)
} }
static void removePosition(const ModelNode &node)
{
ModelNode modelNode = node;
if (modelNode.hasProperty("x"))
modelNode.removeProperty("x");
if (modelNode.hasProperty("y"))
modelNode.removeProperty("y");
}
void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList<ModelNode> &modelNodes, int targetIndex) void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList<ModelNode> &modelNodes, int targetIndex)
{ {
try { try {
@@ -529,12 +538,8 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentPropert
} }
if (parentProperty.isDefaultProperty() && parentProperty.parentModelNode().metaInfo().isLayoutable()) { if (parentProperty.isDefaultProperty() && parentProperty.parentModelNode().metaInfo().isLayoutable()) {
ModelNode currentNode = node; removePosition(node);
if (currentNode.hasProperty("x")) parentProperty.reparentHere(node);
currentNode.removeProperty("x");
if (currentNode.hasProperty("y"))
currentNode.removeProperty("y");
parentProperty.reparentHere(currentNode);
} else { } else {
if (QmlItemNode(node).isValid()) { if (QmlItemNode(node).isValid()) {
QPointF scenePos = QmlItemNode(node).instanceScenePosition(); QPointF scenePos = QmlItemNode(node).instanceScenePosition();