diff options
Diffstat (limited to 'src')
| -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) |