From 9af961cf3bc72b5bb3036644399624121720c3fc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 22 Oct 2016 20:37:54 +0200 Subject: Dialog: fix implicit size calculation Header and footer visibility must be taken into account. Change-Id: Id9bab1d66c126247df77effb153fefa3a78a1d79 Reviewed-by: Mitch Curtis --- src/imports/controls/Dialog.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/Dialog.qml') 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) -- cgit v1.2.3