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 | |
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
-rw-r--r-- | src/imports/controls/Page.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/fusion/Page.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/imagine/Page.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/material/Page.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/universal/Page.qml | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_page.qml | 7 |
6 files changed, 20 insertions, 17 deletions
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index b479fd7d..a6c00806 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -43,9 +43,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) 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) diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 5c0a86eb..4b97c9d0 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -43,9 +43,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) diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 4594467c..c540a0bf 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -42,9 +42,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) diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index a67aa9a6..bf4aa820 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -42,9 +42,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) diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index 5d5a7e8b..c709c216 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -241,10 +241,13 @@ TestCase { + control.header.implicitHeight + control.footer.implicitHeight + 2 * control.spacing) control.header.implicitWidth = 150 - compare(control.implicitWidth, control.header.implicitWidth + control.leftPadding + control.rightPadding) + compare(control.implicitWidth, control.header.implicitWidth) control.footer.implicitWidth = 160 - compare(control.implicitWidth, control.footer.implicitWidth + control.leftPadding + control.rightPadding) + compare(control.implicitWidth, control.footer.implicitWidth) + + control.contentItem.implicitWidth = 170 + compare(control.implicitWidth, control.contentItem.implicitWidth + control.leftPadding + control.rightPadding) } function test_spacing_data() { |