Tumbler: follow the "standard" implicit size calculation practices

Change-Id: I94885e777a9c24cbde856f10e9dd258d8a72e9e1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

6 files changed, 36 insertions, 12 deletions

diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 24576b43..7eafb65d 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -41,8 +41,11 @@ import QtQuick.Templates 2.5 as T
 
 T.Tumbler {
     id: control
-    implicitWidth: 60
-    implicitHeight: 200
+
+    implicitWidth: Math.max(implicitBackgroundWidth,
+                            implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+    implicitHeight: Math.max(implicitBackgroundHeight,
+                             implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
 
     delegate: Text {
         text: modelData
@@ -54,6 +57,8 @@ T.Tumbler {
     }
 
     contentItem: TumblerView {
+        implicitWidth: 60
+        implicitHeight: 200
         model: control.model
         delegate: control.delegate
         path: Path {
diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml
index e6f2381f..be801ec9 100644
--- a/src/imports/controls/fusion/Tumbler.qml
+++ b/src/imports/controls/fusion/Tumbler.qml
@@ -43,8 +43,11 @@ import QtQuick.Controls.Fusion.impl 2.5
 
 T.Tumbler {
     id: control
-    implicitWidth: 60
-    implicitHeight: 200
+
+    implicitWidth: Math.max(implicitBackgroundWidth,
+                            implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+    implicitHeight: Math.max(implicitBackgroundHeight,
+                             implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
 
     delegate: Text {
         text: modelData
@@ -56,6 +59,8 @@ T.Tumbler {
     }
 
     contentItem: TumblerView {
+        implicitWidth: 60
+        implicitHeight: 200
         model: control.model
         delegate: control.delegate
         path: Path {
diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml
index 8c1ebec2..5d8b9835 100644
--- a/src/imports/controls/imagine/Tumbler.qml
+++ b/src/imports/controls/imagine/Tumbler.qml
@@ -43,8 +43,11 @@ import QtQuick.Controls.Imagine.impl 2.5
 
 T.Tumbler {
     id: control
-    implicitWidth: 60
-    implicitHeight: 200
+
+    implicitWidth: Math.max(implicitBackgroundWidth,
+                            implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+    implicitHeight: Math.max(implicitBackgroundHeight,
+                             implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
 
     delegate: Text {
         text: modelData
@@ -56,6 +59,8 @@ T.Tumbler {
     }
 
     contentItem: TumblerView {
+        implicitWidth: 60
+        implicitHeight: 200
         model: control.model
         delegate: control.delegate
         path: Path {
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml
index 836d9456..56b0e44b 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/imports/controls/material/Tumbler.qml
@@ -42,8 +42,11 @@ import QtQuick.Controls.Material 2.5
 
 T.Tumbler {
     id: control
-    implicitWidth: 60
-    implicitHeight: 200
+
+    implicitWidth: Math.max(implicitBackgroundWidth,
+                            implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+    implicitHeight: Math.max(implicitBackgroundHeight,
+                             implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
 
     delegate: Text {
         text: modelData
@@ -55,6 +58,8 @@ T.Tumbler {
     }
 
     contentItem: TumblerView {
+        implicitWidth: 60
+        implicitHeight: 200
         model: control.model
         delegate: control.delegate
         path: Path {
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index 93f9f678..5846c5b8 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -43,8 +43,10 @@ import QtQuick.Controls.impl 2.5
 T.Tumbler {
     id: control
 
-    implicitWidth: 60
-    implicitHeight: 200
+    implicitWidth: Math.max(implicitBackgroundWidth,
+                            implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+    implicitHeight: Math.max(implicitBackgroundHeight,
+                             implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
 
     delegate: Text {
         text: modelData
@@ -56,6 +58,8 @@ T.Tumbler {
     }
 
     contentItem: TumblerView {
+        implicitWidth: 60
+        implicitHeight: 200
         model: control.model
         delegate: control.delegate
         path: Path {
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index d64f7c9c..46c73cfc 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -1035,8 +1035,8 @@ TestCase {
         if (data.bottom !== undefined)
             tumbler.bottomPadding = data.bottom;
 
-        compare(tumbler.availableWidth, implicitTumblerWidth - tumbler.leftPadding - tumbler.rightPadding);
-        compare(tumbler.availableHeight, implicitTumblerHeight - tumbler.topPadding - tumbler.bottomPadding);
+        compare(tumbler.availableWidth, tumbler.implicitWidth - tumbler.leftPadding - tumbler.rightPadding);
+        compare(tumbler.availableHeight, tumbler.implicitHeight - tumbler.topPadding - tumbler.bottomPadding);
         compare(tumbler.contentItem.x, tumbler.leftPadding);
         compare(tumbler.contentItem.y, tumbler.topPadding);