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

Do not reset the render-image size to (0,0) when reaching the size limit

Browse Source 
The size of the image to be rendered for the FormEditor is computed from
the bounding box enclosing the items within the scene.
There is a size limit, when reached the size was reset to (0,0) leading
to an empty FormEditor image. This is now fixed by returning the
bounding box of the root item in case this limit is reached.

Change-Id: I58366610da2e90c34aea6117e225765ff4b3288b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2021-09-27 10:00:59 +02:00
parent a200402a2f
commit ed465a81f5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -335,7 +335,19 @@ QRectF QuickItemNodeInstance::boundingRect() const
if (quickItem()->clip()) { if (quickItem()->clip()) {
return quickItem()->boundingRect(); return quickItem()->boundingRect();
} else { } else {
return boundingRectWithStepChilds(quickItem()); QSize maximumSize(4000, 4000);
auto isValidSize = [maximumSize] (const QRectF& rect) {
QSize size = rect.size().toSize();
return size.width() * size.height() <= maximumSize.width() * maximumSize.height();
};
QRectF rect = boundingRectWithStepChilds(quickItem());
if (isValidSize(rect))
return rect;
else if (rect = quickItem()->boundingRect(); isValidSize(rect))
return rect;
else
return QRectF(QPointF(0.0, 0.0), maximumSize);
} }
} }
@@ -462,8 +474,6 @@ QImage QuickItemNodeInstance::renderImage() const
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QSize size = renderBoundingRect.size().toSize(); QSize size = renderBoundingRect.size().toSize();
static double devicePixelRatio = qgetenv("FORMEDITOR_DEVICE_PIXEL_RATIO").toDouble(); static double devicePixelRatio = qgetenv("FORMEDITOR_DEVICE_PIXEL_RATIO").toDouble();
if (size.width() * size.height() > 4000 * 4000)
size = QSize(0,0);
size *= devicePixelRatio; size *= devicePixelRatio;
if (s_unifiedRenderPath) { if (s_unifiedRenderPath) {