feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not use the rootItemRect for zoom all

Browse Source 
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>
This commit is contained in:
Knud Dollereder
2020-12-10 15:21:28 +01:00
parent 217d0e5832
commit 58ce987314
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
View File

@@ -210,7 +210,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
auto frameAll = [this, zoomOut]() { auto frameAll = [this, zoomOut]() {
if (m_graphicsView) { if (m_graphicsView) {
QRectF bounds; QRectF bounds;
if (QmlItemNode(m_formEditorView->rootModelNode()).isFlowView()) {
QmlItemNode qmlItemNode(m_formEditorView->rootModelNode());
if (qmlItemNode.isFlowView()) {
for (QGraphicsItem *item : m_formEditorView->scene()->items()) { for (QGraphicsItem *item : m_formEditorView->scene()->items()) {
if (auto *fitem = FormEditorItem::fromQGraphicsItem(item)) { if (auto *fitem = FormEditorItem::fromQGraphicsItem(item)) {
if (!fitem->qmlItemNode().modelNode().isRootNode() if (!fitem->qmlItemNode().modelNode().isRootNode()
@@ -219,8 +221,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
} }
} }
} else { } else {
bounds = m_graphicsView->rootItemRect(); bounds = qmlItemNode.instanceBoundingRect();
} }
m_graphicsView->frame(bounds); m_graphicsView->frame(bounds);
zoomOut(); zoomOut();
} }