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/universal/Dialog.qml | |
| 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/universal/Dialog.qml')
| -rw-r--r-- | src/imports/controls/universal/Dialog.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index 98a5efea..907c5ea3 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -42,11 +42,11 @@ import QtQuick.Controls.Universal 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)) |