summaryrefslogtreecommitdiff
path: root/src/layouts
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2013-09-27 15:37:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 00:01:38 +0200
commit4ed5d8048f45557dbbdeb2be1fc8556c7e0df5b9 (patch)
tree307a5152c52e2d55f56b8b0d102398f5bc5b07ab /src/layouts
parenta779ce236ef2606eb27b023ca4538533bb9d2d2b (diff)
downloadqtquickcontrols-4ed5d8048f45557dbbdeb2be1fc8556c7e0df5b9.tar.gz
Respect items maximumwidth also when layouting baseline items
Change-Id: Ie36dcf158f5901ef84ce8b3c06ea9e6069f9c294 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/layouts')
-rw-r--r--src/layouts/qgridlayoutengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/layouts/qgridlayoutengine.cpp b/src/layouts/qgridlayoutengine.cpp
index e6b21e51..a06879c9 100644
--- a/src/layouts/qgridlayoutengine.cpp
+++ b/src/layouts/qgridlayoutengine.cpp
@@ -666,6 +666,7 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig
}
return QRectF(x, y, width, height);
} else {
+ width = qMin(effectiveMaxSize(QSizeF(-1,-1)).width(), width);
qreal descent = vBox.q_minimumDescent;
qreal ascent = vBox.q_minimumSize - descent;
return QRectF(x, y + height - rowDescent - ascent, width, ascent + descent);