Commit 25daed2f authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Fix wrong position for reparenting

Task-number: QTCREATORBUG-3962

Change-Id: Id583e257aa1c1645cb53a8ae32f83717df9b0617
Reviewed-on: http://codereview.qt.nokia.com/926Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarMarco Bubke <marco.bubke@nokia.com>
parent 10fb989c
...@@ -164,14 +164,14 @@ void Qt4InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() ...@@ -164,14 +164,14 @@ void Qt4InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
if (!informationChangedInstanceSet.isEmpty()) if (!informationChangedInstanceSet.isEmpty())
nodeInstanceClient()->informationChanged(createAllInformationChangedCommand(informationChangedInstanceSet.toList())); nodeInstanceClient()->informationChanged(createAllInformationChangedCommand(informationChangedInstanceSet.toList()));
if (!propertyChangedList.isEmpty())
nodeInstanceClient()->valuesChanged(createValuesChangedCommand(propertyChangedList));
if (!m_parentChangedSet.isEmpty()) { if (!m_parentChangedSet.isEmpty()) {
sendChildrenChangedCommand(m_parentChangedSet.toList()); sendChildrenChangedCommand(m_parentChangedSet.toList());
m_parentChangedSet.clear(); m_parentChangedSet.clear();
} }
if (!propertyChangedList.isEmpty())
nodeInstanceClient()->valuesChanged(createValuesChangedCommand(propertyChangedList));
if (adjustSceneRect) { if (adjustSceneRect) {
QRectF boundingRect = rootNodeInstance().boundingRect(); QRectF boundingRect = rootNodeInstance().boundingRect();
if (boundingRect.isValid()) { if (boundingRect.isValid()) {
......
...@@ -88,6 +88,7 @@ void MoveManipulator::setItems(const QList<FormEditorItem*> &itemList) ...@@ -88,6 +88,7 @@ void MoveManipulator::setItems(const QList<FormEditorItem*> &itemList)
} }
} }
void MoveManipulator::synchronizeParent(const QList<FormEditorItem*> &itemList, const ModelNode &parentNode) void MoveManipulator::synchronizeParent(const QList<FormEditorItem*> &itemList, const ModelNode &parentNode)
{ {
bool snapperUpdated = false; bool snapperUpdated = false;
...@@ -114,7 +115,6 @@ void MoveManipulator::synchronizeInstanceParent(const QList<FormEditorItem*> &it ...@@ -114,7 +115,6 @@ void MoveManipulator::synchronizeInstanceParent(const QList<FormEditorItem*> &it
{ {
if (m_view->model() && !m_itemList.isEmpty()) if (m_view->model() && !m_itemList.isEmpty())
synchronizeParent(itemList, m_itemList.first()->qmlItemNode().instanceParent()); synchronizeParent(itemList, m_itemList.first()->qmlItemNode().instanceParent());
} }
void MoveManipulator::updateHashes() void MoveManipulator::updateHashes()
......
...@@ -71,6 +71,7 @@ public: ...@@ -71,6 +71,7 @@ public:
void setItem(FormEditorItem* item); void setItem(FormEditorItem* item);
void synchronizeInstanceParent(const QList<FormEditorItem*> &itemList); void synchronizeInstanceParent(const QList<FormEditorItem*> &itemList);
void synchronizeParent(const QList<FormEditorItem*> &itemList, const ModelNode &parentNode); void synchronizeParent(const QList<FormEditorItem*> &itemList, const ModelNode &parentNode);
void begin(const QPointF& beginPoint); void begin(const QPointF& beginPoint);
void update(const QPointF& updatePoint, Snapping useSnapping, State stateToBeManipulated = UseActualState); void update(const QPointF& updatePoint, Snapping useSnapping, State stateToBeManipulated = UseActualState);
void reparentTo(FormEditorItem *newParent); void reparentTo(FormEditorItem *newParent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment