diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-04-25 16:36:51 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-04-28 08:28:30 +0800 |
| commit | c6ad9c30c894e97cdb60eaf319826e52616dc3cc (patch) | |
| tree | fa103818e427f8ffd09c5ab3c4f11d98a181491a /src/imports/controls | |
| parent | fcc3d346c8aaff74b0054974040d3c1250301563 (diff) | |
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>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/fusion/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/imagine/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/material/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 1 |
5 files changed, 5 insertions, 0 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 |