From 95ae0824045d80cdc8b07b382c11979b7f2ba455 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 24 Nov 2020 17:32:47 +0100 Subject: [PATCH] QmlDesigner: Set the correct root item rect in flow mode This method is called when showing the form editor again, after a hide. Without this the RootItemRect is not set correctly in this case. Change-Id: Ia2339daebb2b2cbcafc223b29878d24cbe371708 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/formeditorview.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 19a3b1c647b..e2ef632928d 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -118,7 +118,7 @@ void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode) setupFormEditorItemTree(nextNode.toQmlItemNode()); } } else if (qmlItemNode.isFlowView() && qmlItemNode.isRootNode()) { - m_scene->addFormEditorItem(qmlItemNode, FormEditorScene::Flow); + FormEditorItem *rootItem = m_scene->addFormEditorItem(qmlItemNode, FormEditorScene::Flow); ModelNode node = qmlItemNode.modelNode(); if (!node.hasAuxiliaryData("width") && !node.hasAuxiliaryData("height")) { @@ -126,6 +126,9 @@ void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode) node.setAuxiliaryData("height", 10000); } + m_scene->synchronizeTransformation(rootItem); + formEditorWidget()->setRootItemRect(qmlItemNode.instanceBoundingRect()); + for (const QmlObjectNode &nextNode : qmlItemNode.allDirectSubNodes()) { if (QmlItemNode::isValidQmlItemNode(nextNode) && nextNode.toQmlItemNode().isFlowItem()) { setupFormEditorItemTree(nextNode.toQmlItemNode());