diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-13 13:57:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-16 08:17:16 +0000 |
| commit | d2496a68bbed9ed7e66faefef1e03e5352cc4100 (patch) | |
| tree | 15bb6a044f6b035a6f54f33518abb7eda9996072 /src/imports/controls/fusion | |
| parent | 28ab81f2c02378735ff82a6e130f0d38d6471069 (diff) | |
Popup: add implicitBackground|ContentWidth|Height properties
[ChangeLog][Controls][Popup] Added implicitBackgroundWidth,
implicitBackgroundHeight, implicitContentWidth, and implicitContentHeight
properties.
Change-Id: I3881b337bbd46b29873e8c00832006eec8b2836a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/Dialog.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Drawer.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Menu.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Popup.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/fusion/ToolTip.qml | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index b9052aa2..e8fefa91 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -44,11 +44,11 @@ import QtQuick.Controls.Fusion.impl 2.5 T.Dialog { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, + implicitWidth: Math.max(implicitBackgroundWidth, header && header.visible ? header.implicitWidth : 0, footer && footer.visible ? footer.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.max(background ? background.implicitHeight : 0, + implicitHeight: Math.max(implicitBackgroundHeight, (header && header.visible ? header.implicitHeight + spacing : 0) + (footer && footer.visible ? footer.implicitHeight + spacing : 0) + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml index 6feb1692..58b0844a 100644 --- a/src/imports/controls/fusion/Drawer.qml +++ b/src/imports/controls/fusion/Drawer.qml @@ -46,8 +46,8 @@ T.Drawer { parent: T.Overlay.overlay - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, contentHeight + topPadding + bottomPadding) topPadding: control.edge === Qt.BottomEdge leftPadding: control.edge === Qt.RightEdge diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index 2b38119e..fbd35283 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -44,10 +44,10 @@ import QtQuick.Controls.Fusion.impl 2.5 T.Menu { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + contentHeight + topPadding + bottomPadding) margins: 0 padding: 1 diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml index 71c506ac..f853d33c 100644 --- a/src/imports/controls/fusion/Popup.qml +++ b/src/imports/controls/fusion/Popup.qml @@ -44,9 +44,9 @@ import QtQuick.Controls.Fusion.impl 2.5 T.Popup { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, + implicitWidth: Math.max(implicitBackgroundWidth, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) - implicitHeight: Math.max(background ? background.implicitHeight : 0, + implicitHeight: Math.max(implicitBackgroundHeight, contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) padding: 6 diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml index 59f64899..59fb7a76 100644 --- a/src/imports/controls/fusion/ToolTip.qml +++ b/src/imports/controls/fusion/ToolTip.qml @@ -47,10 +47,10 @@ T.ToolTip { x: parent ? (parent.width - implicitWidth) / 2 : 0 y: -implicitHeight - 3 - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + contentHeight + topPadding + bottomPadding) margins: 6 padding: 6 |