diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 11:58:21 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 11:58:04 +0000 |
| commit | 775d1b1630b67d308a44b6dad528e3330351b964 (patch) | |
| tree | 72198f49ad690b78dd69bbfc6b243be43b16366e /src/imports/controls/fusion | |
| parent | fd7bd4ec5116fd543ad21a6a63969f08deac4925 (diff) | |
Tumbler: follow the "standard" implicit size calculation practices
Change-Id: I94885e777a9c24cbde856f10e9dd258d8a72e9e1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/Tumbler.qml | 9 |
1 files changed, 7 insertions, 2 deletions
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 { |