diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-05 17:30:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:22:10 +0000 |
| commit | ea4dc11ce772d34ee71e4dca0b09f329e2953c68 (patch) | |
| tree | 29157a824063f161c44c751de449af06903c7a5a /src/imports/controls/fusion | |
| parent | f447493bf9a8cf3490da0f5409d76e7f7fc98759 (diff) | |
QQuickPopupItem: inherit QQuickPane
Change-Id: Ia32f3004cf540f995344286683d754558369f279
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/Dialog.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Drawer.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Popup.qml | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index a2366170..b9052aa2 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -53,9 +53,6 @@ T.Dialog { + (footer && footer.visible ? footer.implicitHeight + spacing : 0) + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 background: Rectangle { diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml index 2ee18a9b..6feb1692 100644 --- a/src/imports/controls/fusion/Drawer.qml +++ b/src/imports/controls/fusion/Drawer.qml @@ -49,9 +49,6 @@ T.Drawer { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - topPadding: control.edge === Qt.BottomEdge leftPadding: control.edge === Qt.RightEdge rightPadding: control.edge === Qt.LeftEdge diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml index 1ac87a25..71c506ac 100644 --- a/src/imports/controls/fusion/Popup.qml +++ b/src/imports/controls/fusion/Popup.qml @@ -49,9 +49,6 @@ T.Popup { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 background: Rectangle { |