diff options
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/Dialog.qml | 12 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Dialog.qml | 12 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Dialog.qml | 12 | ||||
| -rw-r--r-- | src/imports/controls/material/Dialog.qml | 12 | ||||
| -rw-r--r-- | src/imports/controls/universal/Dialog.qml | 12 |
5 files changed, 30 insertions, 30 deletions
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml index 0e3d118c..40e43b7b 100644 --- a/src/imports/controls/Dialog.qml +++ b/src/imports/controls/Dialog.qml @@ -43,13 +43,13 @@ T.Dialog { id: control implicitWidth: Math.max(implicitBackgroundWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0, - contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) implicitHeight: Math.max(implicitBackgroundHeight, - (header && header.visible ? header.implicitHeight + spacing : 0) - + (footer && footer.visible ? footer.implicitHeight + spacing : 0) - + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) padding: 12 diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index e8fefa91..98b9bdd9 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -45,13 +45,13 @@ T.Dialog { id: control implicitWidth: Math.max(implicitBackgroundWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0, - contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) implicitHeight: Math.max(implicitBackgroundHeight, - (header && header.visible ? header.implicitHeight + spacing : 0) - + (footer && footer.visible ? footer.implicitHeight + spacing : 0) - + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) padding: 6 diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index 26f31da5..47834259 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -44,13 +44,13 @@ T.Dialog { id: control implicitWidth: Math.max(implicitBackgroundWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0, - contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) implicitHeight: Math.max(implicitBackgroundHeight, - (header && header.visible ? header.implicitHeight + spacing : 0) - + (footer && footer.visible ? footer.implicitHeight + spacing : 0) - + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 9e0467e5..f147a2d4 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -45,13 +45,13 @@ T.Dialog { id: control implicitWidth: Math.max(implicitBackgroundWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0, - contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) implicitHeight: Math.max(implicitBackgroundHeight, - (header && header.visible ? header.implicitHeight + spacing : 0) - + (footer && footer.visible ? footer.implicitHeight + spacing : 0) - + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) padding: 24 topPadding: 20 diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index 907c5ea3..4f3d8cf0 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -43,13 +43,13 @@ T.Dialog { id: control implicitWidth: Math.max(implicitBackgroundWidth, - header && header.visible ? header.implicitWidth : 0, - footer && footer.visible ? footer.implicitWidth : 0, - contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) implicitHeight: Math.max(implicitBackgroundHeight, - (header && header.visible ? header.implicitHeight + spacing : 0) - + (footer && footer.visible ? footer.implicitHeight + spacing : 0) - + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) padding: 24 verticalPadding: 18 |