diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-22 20:37:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-24 12:14:35 +0000 |
| commit | 9af961cf3bc72b5bb3036644399624121720c3fc (patch) | |
| tree | 5346d48aee6bee43f327d91c812efba2f2e5482c /src/imports/controls | |
| parent | 613813500fb52587f9db7bb1a824241978ae948d (diff) | |
Dialog: fix implicit size calculation
Header and footer visibility must be taken into account.
Change-Id: Id9bab1d66c126247df77effb153fefa3a78a1d79
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/Dialog.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/Dialog.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/universal/Dialog.qml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml index a2522398..ce6df0f6 100644 --- a/src/imports/controls/Dialog.qml +++ b/src/imports/controls/Dialog.qml @@ -43,11 +43,11 @@ T.Dialog { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - header ? header.implicitWidth : 0, - footer ? footer.implicitWidth : 0, + 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, - (header ? header.implicitHeight : 0) + (footer ? footer.implicitHeight : 0)) + (header && header.visible ? header.implicitHeight : 0) + (footer && footer.visible ? footer.implicitHeight : 0)) + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 58bbe99e..1e2e50ac 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -44,11 +44,11 @@ T.Dialog { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - header ? header.implicitWidth : 0, - footer ? footer.implicitWidth : 0, + 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, - (header ? header.implicitHeight : 0) + (footer ? footer.implicitHeight : 0)) + (header && header.visible ? header.implicitHeight : 0) + (footer && footer.visible ? footer.implicitHeight : 0)) + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index e282d055..194a2f4f 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -43,11 +43,11 @@ T.Dialog { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - header ? header.implicitWidth : 0, - footer ? footer.implicitWidth : 0, + 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, - (header ? header.implicitHeight : 0) + (footer ? footer.implicitHeight : 0)) + (header && header.visible ? header.implicitHeight : 0) + (footer && footer.visible ? footer.implicitHeight : 0)) + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) |