aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Eftevaag <oliver.eftevaag@qt.io>2022-02-17 14:20:26 +0100
committerOliver Eftevaag <oliver.eftevaag@qt.io>2022-02-21 10:01:10 +0100
commit0c4610b58ee957180952c79c18c41ba6377b1fa4 (patch)
tree64aec154e250d97add03921d76b8543021a602c0
parent88147eb3f621e7d972410698d6edca16493d7c66 (diff)
MessageDialog: use QQuickDialog::implicitFooterHeight for implicitHeight
Using the dialog implicitFooterWidth in the implicitWidth binding is causing an infinite loop. But using the implicitFooterHeight for the implicitHeight binding is not causing any issues what so ever. Pick-to: 6.3 Task-number: QTBUG-99103 Change-Id: I6ba70bc9871d956e3ccd54662139dd1698d656ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml2
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml2
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml2
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml2
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml
index 4d0b90c3a7..54c17af2f2 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml
@@ -55,7 +55,7 @@ MessageDialogImpl {
implicitHeight: Math.max(control.implicitBackgroundHeight + control.topInset + control.bottomInset,
control.contentHeight + control.topPadding + control.bottomPadding
+ (control.implicitHeaderHeight > 0 ? control.implicitHeaderHeight + control.spacing : 0)
- + (columnLayout.implicitHeight > 0 ? columnLayout.implicitHeight + control.spacing : 0))
+ + (control.implicitFooterHeight > 0 ? control.implicitFooterHeight + control.spacing : 0))
leftPadding: 20
rightPadding: 20
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
index 2f0b31ada7..f8a2eec922 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
@@ -58,7 +58,7 @@ MessageDialogImpl {
implicitBackgroundHeight + topInset + bottomInset,
contentHeight + topPadding + bottomPadding
+ (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0)
- + (columnLayout.implicitHeight > 0 ? columnLayout.implicitHeight + spacing : 0))
+ + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
topPadding: background ? background.topPadding : 0
leftPadding: background ? background.leftPadding : 0
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml
index 49c517d252..d1f7857e4b 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Material/MessageDialog.qml
@@ -54,7 +54,7 @@ MessageDialogImpl {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
contentHeight + topPadding + bottomPadding
+ (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0)
- + (columnLayout.implicitHeight > 0 ? columnLayout.implicitHeight + spacing : 0))
+ + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
leftPadding: 24
rightPadding: 24
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
index 7194a3a6aa..ca4d3f3cea 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
@@ -54,7 +54,7 @@ MessageDialogImpl {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
contentHeight + topPadding + bottomPadding
+ (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0)
- + (columnLayout.implicitHeight > 0 ? columnLayout.implicitHeight + spacing : 0))
+ + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
padding: 24
verticalPadding: 18
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
index 3bd1cdb88b..5a7bcc6112 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
@@ -53,7 +53,7 @@ MessageDialogImpl {
implicitHeight: Math.max(control.implicitBackgroundHeight + control.topInset + control.bottomInset,
control.contentHeight + control.topPadding + control.bottomPadding
+ (control.implicitHeaderHeight > 0 ? control.implicitHeaderHeight + control.spacing : 0)
- + (columnLayout.implicitHeight > 0 ? columnLayout.implicitHeight + control.spacing : 0))
+ + (control.implicitFooterHeight > 0 ? control.implicitFooterHeight + control.spacing : 0))
leftPadding: 20
rightPadding: 20