diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-09 14:37:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-09 15:57:07 +0000 |
| commit | 2f4726883b17fe2c935ac2e5d1bfa9b2bca8b5e3 (patch) | |
| tree | 7c8671b18f1ad739d6172bdc6ec10fc274efa036 /src/imports | |
| parent | 87dec648804bfa974a297c37542dd77de9f72e9f (diff) | |
Inherit QQuickPage from QQuickPane
This allows us to remove a lot of duplicate code, and Page gets the
same automatic content size calculation that was added to Pane.
Change-Id: I98dc3a5070d61c1720dc11003bc4076aba481b3a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/Page.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Page.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Page.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/material/Page.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/universal/Page.qml | 3 |
5 files changed, 0 insertions, 15 deletions
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index b081dd5c..3950d702 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -51,9 +51,6 @@ T.Page { + (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - background: Rectangle { color: control.palette.window } diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml index d89426f6..cdc473e5 100644 --- a/src/imports/controls/fusion/Page.qml +++ b/src/imports/controls/fusion/Page.qml @@ -53,9 +53,6 @@ T.Page { + (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - background: Rectangle { color: palette.window } diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 06badf67..8dcd6dfc 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -51,9 +51,6 @@ T.Page { + (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 rightPadding: background ? background.rightPadding : 0 diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 44403828..71420ed1 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -50,9 +50,6 @@ T.Page { + (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - background: Rectangle { color: control.Material.backgroundColor } diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index 957ae194..7eda011e 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -50,9 +50,6 @@ T.Page { + (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - background: Rectangle { color: control.Universal.background } |