diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:56:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:56:41 +0200 |
| commit | 7a6249c8f9fdfb829312135073ce8733d1d721a5 (patch) | |
| tree | 8d11636c27beda4f7de92630f21ae2451d2397eb /src/imports/controls/fusion | |
| parent | 76067f3699217e9574c72660ea65827819c7ffea (diff) | |
| parent | c0232099a9fac03ef0f5287b6a26dbbd46669c06 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/controls/Page.qml
src/imports/controls/fusion/Page.qml
src/imports/controls/imagine/Page.qml
src/imports/controls/material/Page.qml
src/imports/controls/universal/Page.qml
Change-Id: I5acf99d0d2009151d6daff9420d79cb06909c873
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/Page.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml index 3c1e2c16..b258d493 100644 --- a/src/imports/controls/fusion/Page.qml +++ b/src/imports/controls/fusion/Page.qml @@ -45,9 +45,9 @@ T.Page { id: control implicitWidth: Math.max(implicitBackgroundWidth, - Math.max(contentWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0) + leftPadding + rightPadding) + contentWidth + leftPadding + rightPadding, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0) implicitHeight: Math.max(implicitBackgroundHeight, contentHeight + topPadding + bottomPadding + (header && header.visible ? header.implicitHeight + spacing : 0) |