aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKnud Dollereder <knud.dollereder@qt.io>2020-12-10 15:21:28 +0100
committerKnud Dollereder <knud.dollereder@qt.io>2020-12-11 11:02:26 +0000
commit58ce987314779deebc95849265184fda12541ca2 (patch)
tree5c21f202bf0a64f6606c0bab28c42494f5754d2e /src
parent217d0e583252d0797d5099f0ad39ff58dd0a6528 (diff)
Do not use the rootItemRect for zoom all
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 <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index cf7a5759e2..ac303a3233 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();
}