DialogButtonBox: fix buttons going outside box on size change

This was removed in c2fd8f7d00e2a47724765e289b828c36c98da29c, but seems
to be necessary now. A horizontal ListView's implicitWidth is 0, so
setting it to contentWidth seems reasonable regardless.

For more history, see 8b78d9cea3091b0bd94d1ae0c71a000f8e7e1903.

Fixes: QTBUG-102558
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 2ae87dcece1915797de8065048817707c8f4d24f)
Change-Id: I3d67bcd5dbc0297620847f27363acce43a5dc862
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

6 files changed, 88 insertions, 1 deletions

diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml
index 00c4c911..951023c8 100644
--- a/src/imports/controls/DialogButtonBox.qml
+++ b/src/imports/controls/DialogButtonBox.qml
@@ -55,6 +55,7 @@ T.DialogButtonBox {
     }
 
     contentItem: ListView {
+        implicitWidth: contentWidth
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/imports/controls/fusion/DialogButtonBox.qml
index 834fe0fc..70b8d868 100644
--- a/src/imports/controls/fusion/DialogButtonBox.qml
+++ b/src/imports/controls/fusion/DialogButtonBox.qml
@@ -56,6 +56,7 @@ T.DialogButtonBox {
     delegate: Button { }
 
     contentItem: ListView {
+        implicitWidth: contentWidth
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml
index b0ae182f..cb00be96 100644
--- a/src/imports/controls/imagine/DialogButtonBox.qml
+++ b/src/imports/controls/imagine/DialogButtonBox.qml
@@ -66,6 +66,7 @@ T.DialogButtonBox {
     }
 
     contentItem: ListView {
+        implicitWidth: contentWidth
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml
index d530f569..51b85503 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/imports/controls/material/DialogButtonBox.qml
@@ -60,6 +60,7 @@ T.DialogButtonBox {
     delegate: Button { flat: true }
 
     contentItem: ListView {
+        implicitWidth: contentWidth
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml
index 9438ec16..aec0dc96 100644
--- a/src/imports/controls/universal/DialogButtonBox.qml
+++ b/src/imports/controls/universal/DialogButtonBox.qml
@@ -59,6 +59,7 @@ T.DialogButtonBox {
     }
 
     contentItem: ListView {
+        implicitWidth: contentWidth
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index a651713a..63cefa46 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -398,7 +398,7 @@ TestCase {
 
     // QTBUG-72886
     function test_changeCustomButtonText(data) {
-        var control = createTemporaryObject(customButtonBox, testCase, {})
+        var control = createTemporaryObject(data.component, testCase, {})
         verify(control)
 
         var listView = control.contentItem
@@ -418,6 +418,88 @@ TestCase {
     }
 
     Component {
+        id: customButtonBoxInDialog
+
+        Dialog {
+            width: 300
+            visible: true
+
+            footer: DialogButtonBox {
+                objectName: "customButtonBoxInDialog"
+                alignment: Qt.AlignRight
+
+                property alias okButton: okButton
+
+                Button {
+                    id: okButton
+                    text: "OK"
+
+                    DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
+                }
+            }
+        }
+    }
+
+    Component {
+        id: customButtonBoxTwoButtonsInDialog
+
+        Dialog {
+            width: 300
+            visible: true
+
+            footer: DialogButtonBox {
+                objectName: "customButtonBoxTwoButtonsInDialog"
+                alignment: Qt.AlignRight
+
+                property alias okButton: okButton
+
+                Button {
+                    id: okButton
+                    text: "OK"
+
+                    DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
+                }
+                Button {
+                    text: "Cancel"
+
+                    DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
+                }
+            }
+        }
+    }
+
+    function test_changeCustomButtonImplicitWidth_data() {
+        return [
+            { tag: "oneButton", component: customButtonBoxInDialog },
+            { tag: "twoButtons", component: customButtonBoxTwoButtonsInDialog },
+        ]
+    }
+
+    // QTBUG-102558
+    function test_changeCustomButtonImplicitWidth(data) {
+        let dialog = createTemporaryObject(data.component, testCase, {})
+        verify(dialog)
+
+        let control = dialog.footer
+        verify(control)
+
+        let listView = control.contentItem
+        waitForRendering(listView)
+
+        let button = control.okButton
+        verify(button)
+        button.implicitWidth *= 1.5
+
+        // The button should never go outside of the box.
+        tryVerify(function() { return button.mapToItem(control, 0, 0).x >= 0 },
+            1000, "Expected left edge of button to be within left edge of DialogButtonBox (i.e. greater than or equal to 0)" +
+                ", but it's " + button.mapToItem(control, 0, 0).x)
+        tryVerify(function() { return button.mapToItem(control, 0, 0).x + button.width <= control.width },
+            1000, "Expected right edge of button to be within right edge of DialogButtonBox (i.e. less than or equal to " +
+                control.width + "), but it's " + (button.mapToItem(control, 0, 0).x + button.width))
+    }
+
+    Component {
         id: noRolesDialog
 
         Dialog {