From 25daed2f03d1869916a36033ceafa96b4daedbae Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 29 Jun 2011 21:10:50 +0200 Subject: [PATCH] QmlDesigner: Fix wrong position for reparenting Task-number: QTCREATORBUG-3962 Change-Id: Id583e257aa1c1645cb53a8ae32f83717df9b0617 Reviewed-on: http://codereview.qt.nokia.com/926 Reviewed-by: Qt Sanity Bot Reviewed-by: Marco Bubke --- .../instances/qt4informationnodeinstanceserver.cpp | 6 +++--- .../qmldesigner/components/formeditor/movemanipulator.cpp | 2 +- .../qmldesigner/components/formeditor/movemanipulator.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp index 48ab73adf9b..7ac1e8546f0 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp @@ -164,14 +164,14 @@ void Qt4InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() if (!informationChangedInstanceSet.isEmpty()) nodeInstanceClient()->informationChanged(createAllInformationChangedCommand(informationChangedInstanceSet.toList())); - if (!propertyChangedList.isEmpty()) - nodeInstanceClient()->valuesChanged(createValuesChangedCommand(propertyChangedList)); - if (!m_parentChangedSet.isEmpty()) { sendChildrenChangedCommand(m_parentChangedSet.toList()); m_parentChangedSet.clear(); } + if (!propertyChangedList.isEmpty()) + nodeInstanceClient()->valuesChanged(createValuesChangedCommand(propertyChangedList)); + if (adjustSceneRect) { QRectF boundingRect = rootNodeInstance().boundingRect(); if (boundingRect.isValid()) { diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index 91926dc5dfd..ce855211c2f 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -88,6 +88,7 @@ void MoveManipulator::setItems(const QList &itemList) } } + void MoveManipulator::synchronizeParent(const QList &itemList, const ModelNode &parentNode) { bool snapperUpdated = false; @@ -114,7 +115,6 @@ void MoveManipulator::synchronizeInstanceParent(const QList &it { if (m_view->model() && !m_itemList.isEmpty()) synchronizeParent(itemList, m_itemList.first()->qmlItemNode().instanceParent()); - } void MoveManipulator::updateHashes() diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h index 671feef0388..685bc1504e8 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h @@ -71,6 +71,7 @@ public: void setItem(FormEditorItem* item); void synchronizeInstanceParent(const QList &itemList); void synchronizeParent(const QList &itemList, const ModelNode &parentNode); + void begin(const QPointF& beginPoint); void update(const QPointF& updatePoint, Snapping useSnapping, State stateToBeManipulated = UseActualState); void reparentTo(FormEditorItem *newParent);