diff options
Diffstat (limited to 'src')
| -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 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index df56dcbe..23377368 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -43,9 +43,9 @@ T.Page { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - 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(background ? background.implicitHeight : 0, 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 20febd6a..842db2d0 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(background ? background.implicitWidth : 0, - 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(background ? background.implicitHeight : 0, 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 72f54830..c3dd355e 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(background ? background.implicitWidth : 0, - 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(background ? background.implicitHeight : 0, 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 9993aa0f..647d8f0f 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(background ? background.implicitWidth : 0, - 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(background ? background.implicitHeight : 0, 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 de8482d8..734ea245 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(background ? background.implicitWidth : 0, - 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(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding + (header && header.visible ? header.implicitHeight + spacing : 0) |