QmlDesigner: Fix wrong position for reparenting

Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c
DoneBy: Marco Bubke
Task-number: QTCREATORBUG-3962
Reviewed-on: http://codereview.qt.nokia.com/958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

1 files changed, 18 insertions, 7 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index 14bcc54256..c673e74130 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -88,6 +88,24 @@ void MoveManipulator::setItems(const QList<FormEditorItem*> &itemList)
     }
 }
 
+void MoveManipulator::synchronizeInstanceParent(const QList<FormEditorItem*> &itemList)
+{
+    if (m_view->model()) {
+        foreach (FormEditorItem *item, itemList) {
+            if (m_itemList.contains(item)) {
+                QmlItemNode parentItemNode = QmlItemNode(item->qmlItemNode().instanceParent());
+                if (parentItemNode.isValid()) {
+                    m_snapper.setContainerFormEditorItem(m_view->scene()->itemForQmlItemNode(parentItemNode));
+                    m_snapper.setTransformtionSpaceFormEditorItem(m_snapper.containerFormEditorItem());
+                    m_snapper.updateSnappingLines(m_itemList);
+                    updateHashes();
+                    break;
+                }
+            }
+        }
+    }
+}
+
 void MoveManipulator::updateHashes()
 {
 //    foreach (FormEditorItem* item, m_itemList)
@@ -344,13 +362,6 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent)
                 item->qmlItemNode().setParentProperty(parent.nodeAbstractProperty("data"));
         }
     }
-
-    if (m_view->model()) {
-        m_snapper.setContainerFormEditorItem(newParent);
-        m_snapper.setTransformtionSpaceFormEditorItem(m_snapper.containerFormEditorItem());
-        m_snapper.updateSnappingLines(m_itemList);
-        updateHashes();
-    }
 }