From 58ce987314779deebc95849265184fda12541ca2 Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Thu, 10 Dec 2020 15:21:28 +0100 Subject: [PATCH] Do not use the rootItemRect for zoom all MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit since this is set to null - indirectly from the showEvent of FormEditorWidget. Use the instanceBoundingRect of the rootNode instead. Fixes: QDS-3316 Change-Id: Ia156e5b675bc1c517c4b3f5c640b22d9c47bc117 Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index cf7a5759e25..ac303a32339 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -210,7 +210,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) auto frameAll = [this, zoomOut]() { if (m_graphicsView) { QRectF bounds; - if (QmlItemNode(m_formEditorView->rootModelNode()).isFlowView()) { + + QmlItemNode qmlItemNode(m_formEditorView->rootModelNode()); + if (qmlItemNode.isFlowView()) { for (QGraphicsItem *item : m_formEditorView->scene()->items()) { if (auto *fitem = FormEditorItem::fromQGraphicsItem(item)) { if (!fitem->qmlItemNode().modelNode().isRootNode() @@ -219,8 +221,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) } } } else { - bounds = m_graphicsView->rootItemRect(); + bounds = qmlItemNode.instanceBoundingRect(); } + m_graphicsView->frame(bounds); zoomOut(); }