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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I71b19dd8ecd96a7a2a58622f68283b8635264e48
This commit is contained in:
Eike Ziller
2021-12-01 09:24:05 +01:00
parent 333374e6a9 b6fe15294e
commit d62d0f305b
106 changed files with 754 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+12
View File
@@ -329,11 +329,23 @@ QRectF QuickItemNodeInstance::contentItemBoundingBox() const
return QRectF();
}
static bool layerEnabledAndEffect(QQuickItem *item)
{
QQuickItemPrivate *pItem = QQuickItemPrivate::get(item);
if (pItem && pItem->layer() && pItem->layer()->enabled() && pItem->layer()->effect())
return true;
return false;
}
QRectF QuickItemNodeInstance::boundingRect() const
{
if (quickItem()) {
if (quickItem()->clip()) {
return quickItem()->boundingRect();
} else if (layerEnabledAndEffect(quickItem())) {
return ServerNodeInstance::effectAdjustedBoundingRect(quickItem());
} else {
QSize maximumSize(4000, 4000);
auto isValidSize = [maximumSize] (const QRectF& rect) {