aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-03-22 16:49:13 +0100
committerMitch Curtis <mitch.curtis@qt.io>2017-03-23 07:36:10 +0000
commit46002360df4e33e07c439d1cd57f3cd39895adcd (patch)
treec8c7493cd1359f9630fc850b39e9448d6ae7a0cb /src
parent05359cd83e852b97d5e53386255ff655eff0f93d (diff)
QQuickDisplayLayout: call layout on child item implicit size changes
This is necessary when the layout has an explicit size larger than its implicit size, and hence child item implicit size changes don't trigger geometryChanged() (where layout() is called). Change-Id: Ieacebff50503c101358e1dd6fda85ac495120af7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quickcontrols2/qquickdisplaylayout.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickdisplaylayout.cpp b/src/quickcontrols2/qquickdisplaylayout.cpp
index 95062493..5ce21d4d 100644
--- a/src/quickcontrols2/qquickdisplaylayout.cpp
+++ b/src/quickcontrols2/qquickdisplaylayout.cpp
@@ -167,11 +167,13 @@ void QQuickDisplayLayoutPrivate::unwatchChanges(QQuickItem* item)
void QQuickDisplayLayoutPrivate::itemImplicitWidthChanged(QQuickItem *)
{
updateImplicitSize();
+ layout();
}
void QQuickDisplayLayoutPrivate::itemImplicitHeightChanged(QQuickItem *)
{
updateImplicitSize();
+ layout();
}
void QQuickDisplayLayoutPrivate::itemDestroyed(QQuickItem *item)