diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-08 20:50:13 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 06:58:45 +0000 |
| commit | 0764003773e3db3ffdd76021f1a17359cb52452c (patch) | |
| tree | 37f245cf555fb21f4b9ead27c1577315a7e109e5 /src/quicktemplates2 | |
| parent | 6cfe57e63da33a1f82133663b7de3a6d69d7f462 (diff) | |
AppWindow: take header & footer visibility into account in relayout()
Task-number: QTBUG-55143
Change-Id: I2acf8ca720df33a0417d850b5b0410ec9166dc89
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 878fe7c7..2706d9b6 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -150,8 +150,8 @@ void QQuickApplicationWindowPrivate::relayout() { Q_Q(QQuickApplicationWindow); QQuickItem *content = q->contentItem(); - qreal hh = header ? header->height() : 0; - qreal fh = footer ? footer->height() : 0; + qreal hh = header && header->isVisible() ? header->height() : 0; + qreal fh = footer && footer->isVisible() ? footer->height() : 0; content->setY(hh); content->setWidth(q->width()); |