Compute implicitSize based on implicitContentSize in Container and subclasses

Now that Container reflects its explicitly set contentWidth/Height through
implicitContentWidth/Height we can use the same expression for implicit
width/height as regular controls, which hooks us into the safe area
binding loop detection as well.

Pick-to: 6.9
Change-Id: If0a710a5eb4a35c91d02d7170b5e03e457e6bc12
Reviewed-by: Oliver Eftevaag <[email protected]>
Reviewed-by: Richard Moe Gustavsen <[email protected]>

24 files changed, 48 insertions, 48 deletions

diff --git a/src/quickcontrols/basic/Container.qml b/src/quickcontrols/basic/Container.qml
index 28e50279f0..c9002387a8 100644
--- a/src/quickcontrols/basic/Container.qml
+++ b/src/quickcontrols/basic/Container.qml
@@ -8,7 +8,7 @@ T.Container {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 }
diff --git a/src/quickcontrols/basic/MenuBar.qml b/src/quickcontrols/basic/MenuBar.qml
index c0d4bda60d..4b72ae9acf 100644
--- a/src/quickcontrols/basic/MenuBar.qml
+++ b/src/quickcontrols/basic/MenuBar.qml
@@ -9,9 +9,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     delegate: MenuBarItem { }
 
diff --git a/src/quickcontrols/basic/SwipeView.qml b/src/quickcontrols/basic/SwipeView.qml
index b0068fd301..dfb7cb4b92 100644
--- a/src/quickcontrols/basic/SwipeView.qml
+++ b/src/quickcontrols/basic/SwipeView.qml
@@ -8,9 +8,9 @@ T.SwipeView {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     contentItem: ListView {
         model: control.contentModel
diff --git a/src/quickcontrols/basic/TabBar.qml b/src/quickcontrols/basic/TabBar.qml
index f8bdb91460..39a67c5b77 100644
--- a/src/quickcontrols/basic/TabBar.qml
+++ b/src/quickcontrols/basic/TabBar.qml
@@ -8,9 +8,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 1
 
diff --git a/src/quickcontrols/fluentwinui3/MenuBar.qml b/src/quickcontrols/fluentwinui3/MenuBar.qml
index 56cc205a56..7487fdb6e2 100644
--- a/src/quickcontrols/fluentwinui3/MenuBar.qml
+++ b/src/quickcontrols/fluentwinui3/MenuBar.qml
@@ -9,9 +9,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: config.spacing || 0
 
diff --git a/src/quickcontrols/fluentwinui3/TabBar.qml b/src/quickcontrols/fluentwinui3/TabBar.qml
index 09b0068c2c..92c22ebc18 100644
--- a/src/quickcontrols/fluentwinui3/TabBar.qml
+++ b/src/quickcontrols/fluentwinui3/TabBar.qml
@@ -9,9 +9,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: config.spacing || 0
 
diff --git a/src/quickcontrols/fusion/DialogButtonBox.qml b/src/quickcontrols/fusion/DialogButtonBox.qml
index 566058fa73..82f7d4554e 100644
--- a/src/quickcontrols/fusion/DialogButtonBox.qml
+++ b/src/quickcontrols/fusion/DialogButtonBox.qml
@@ -11,9 +11,9 @@ T.DialogButtonBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 6
     padding: 6
diff --git a/src/quickcontrols/fusion/MenuBar.qml b/src/quickcontrols/fusion/MenuBar.qml
index 6e039d8a3e..327d107926 100644
--- a/src/quickcontrols/fusion/MenuBar.qml
+++ b/src/quickcontrols/fusion/MenuBar.qml
@@ -11,9 +11,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     delegate: MenuBarItem { }
 
diff --git a/src/quickcontrols/fusion/TabBar.qml b/src/quickcontrols/fusion/TabBar.qml
index 275bcf5a2a..c66a792c04 100644
--- a/src/quickcontrols/fusion/TabBar.qml
+++ b/src/quickcontrols/fusion/TabBar.qml
@@ -11,9 +11,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: -1
 
diff --git a/src/quickcontrols/imagine/DialogButtonBox.qml b/src/quickcontrols/imagine/DialogButtonBox.qml
index 81d87b65df..0723ad7ea8 100644
--- a/src/quickcontrols/imagine/DialogButtonBox.qml
+++ b/src/quickcontrols/imagine/DialogButtonBox.qml
@@ -10,9 +10,9 @@ T.DialogButtonBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            (control.count === 1 ? contentWidth * 2 : contentWidth) + leftPadding + rightPadding)
+                            (control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     topPadding: background ? background.topPadding : 0
     leftPadding: background ? background.leftPadding : 0
diff --git a/src/quickcontrols/imagine/SwipeView.qml b/src/quickcontrols/imagine/SwipeView.qml
index c0bafd1233..47b81665a2 100644
--- a/src/quickcontrols/imagine/SwipeView.qml
+++ b/src/quickcontrols/imagine/SwipeView.qml
@@ -10,9 +10,9 @@ T.SwipeView {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     topPadding: background ? background.topPadding : 0
     leftPadding: background ? background.leftPadding : 0
diff --git a/src/quickcontrols/imagine/TabBar.qml b/src/quickcontrols/imagine/TabBar.qml
index a0086cb76f..32c5f5f205 100644
--- a/src/quickcontrols/imagine/TabBar.qml
+++ b/src/quickcontrols/imagine/TabBar.qml
@@ -10,9 +10,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     topPadding: background ? background.topPadding : 0
     leftPadding: background ? background.leftPadding : 0
diff --git a/src/quickcontrols/ios/DialogButtonBox.qml b/src/quickcontrols/ios/DialogButtonBox.qml
index b368a8290d..abffea1596 100644
--- a/src/quickcontrols/ios/DialogButtonBox.qml
+++ b/src/quickcontrols/ios/DialogButtonBox.qml
@@ -10,9 +10,9 @@ T.DialogButtonBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     readonly property var orientation: (count === 2 || alignment !== 0)
                                         ? ListView.Horizontal : ListView.Vertical
diff --git a/src/quickcontrols/ios/MenuBar.qml b/src/quickcontrols/ios/MenuBar.qml
index ae611667b4..ea7a0ab608 100644
--- a/src/quickcontrols/ios/MenuBar.qml
+++ b/src/quickcontrols/ios/MenuBar.qml
@@ -9,9 +9,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     delegate: MenuBarItem { }
 
diff --git a/src/quickcontrols/ios/TabBar.qml b/src/quickcontrols/ios/TabBar.qml
index 99434fa14d..cd1ce8fcaf 100644
--- a/src/quickcontrols/ios/TabBar.qml
+++ b/src/quickcontrols/ios/TabBar.qml
@@ -8,9 +8,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 1
 
diff --git a/src/quickcontrols/macos/DialogButtonBox.qml b/src/quickcontrols/macos/DialogButtonBox.qml
index b99de3354c..df80f9eccc 100644
--- a/src/quickcontrols/macos/DialogButtonBox.qml
+++ b/src/quickcontrols/macos/DialogButtonBox.qml
@@ -9,9 +9,9 @@ T.DialogButtonBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 6
     padding: 6
diff --git a/src/quickcontrols/macos/MenuBar.qml b/src/quickcontrols/macos/MenuBar.qml
index 2b1e63fc30..b979fbbdb4 100644
--- a/src/quickcontrols/macos/MenuBar.qml
+++ b/src/quickcontrols/macos/MenuBar.qml
@@ -9,9 +9,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     leftPadding: 6
     rightPadding: 6
diff --git a/src/quickcontrols/material/DialogButtonBox.qml b/src/quickcontrols/material/DialogButtonBox.qml
index 55b2011c83..b2fc1bef36 100644
--- a/src/quickcontrols/material/DialogButtonBox.qml
+++ b/src/quickcontrols/material/DialogButtonBox.qml
@@ -11,9 +11,9 @@ T.DialogButtonBox {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 8
     padding: 8
diff --git a/src/quickcontrols/material/MenuBar.qml b/src/quickcontrols/material/MenuBar.qml
index c31b5b3158..6a3ec3a676 100644
--- a/src/quickcontrols/material/MenuBar.qml
+++ b/src/quickcontrols/material/MenuBar.qml
@@ -11,9 +11,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     delegate: MenuBarItem { }
 
diff --git a/src/quickcontrols/material/SwipeView.qml b/src/quickcontrols/material/SwipeView.qml
index 72e63dd4d2..713d770bd2 100644
--- a/src/quickcontrols/material/SwipeView.qml
+++ b/src/quickcontrols/material/SwipeView.qml
@@ -9,9 +9,9 @@ T.SwipeView {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     contentItem: ListView {
         model: control.contentModel
diff --git a/src/quickcontrols/material/TabBar.qml b/src/quickcontrols/material/TabBar.qml
index 5daffc9797..6e4ce4ef4d 100644
--- a/src/quickcontrols/material/TabBar.qml
+++ b/src/quickcontrols/material/TabBar.qml
@@ -10,9 +10,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     spacing: 1
 
diff --git a/src/quickcontrols/universal/MenuBar.qml b/src/quickcontrols/universal/MenuBar.qml
index 1c0f4c6b2d..eebc5d8df0 100644
--- a/src/quickcontrols/universal/MenuBar.qml
+++ b/src/quickcontrols/universal/MenuBar.qml
@@ -10,9 +10,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     delegate: MenuBarItem { }
 
diff --git a/src/quickcontrols/universal/TabBar.qml b/src/quickcontrols/universal/TabBar.qml
index c06aaaf541..5cf0ee4cf6 100644
--- a/src/quickcontrols/universal/TabBar.qml
+++ b/src/quickcontrols/universal/TabBar.qml
@@ -9,9 +9,9 @@ T.TabBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     contentItem: ListView {
         model: control.contentModel
diff --git a/src/quickcontrols/windows/MenuBar.qml b/src/quickcontrols/windows/MenuBar.qml
index ec998abde7..ba18959a17 100644
--- a/src/quickcontrols/windows/MenuBar.qml
+++ b/src/quickcontrols/windows/MenuBar.qml
@@ -9,9 +9,9 @@ T.MenuBar {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            contentWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             contentHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     leftPadding: 3
     rightPadding: 3