diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-15 12:49:07 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-15 12:49:07 +0100 |
| commit | e8106ba7700e1666d1dbb3a9f1a579146dfdb681 (patch) | |
| tree | 2f22b1429b8b74c59649004db586114f3e12e128 /src/imports/controls/universal/Tumbler.qml | |
| parent | 589d52b3b64a4b5221738a28df08be2eae4d12b2 (diff) | |
| parent | d61567f3cfa100aeab865bd6b436de87970575f5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickcontrol.cpp
tests/auto/sanity/tst_sanity.cpp
Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
Diffstat (limited to 'src/imports/controls/universal/Tumbler.qml')
| -rw-r--r-- | src/imports/controls/universal/Tumbler.qml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index c4fc9ea3..70e80354 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -56,15 +56,14 @@ T.Tumbler { } contentItem: TumblerView { - id: tumblerView model: control.model delegate: control.delegate path: Path { - startX: tumblerView.width / 2 - startY: -tumblerView.delegateHeight / 2 + startX: contentItem.width / 2 + startY: -contentItem.delegateHeight / 2 PathLine { - x: tumblerView.width / 2 - y: (control.visibleItemCount + 1) * tumblerView.delegateHeight - tumblerView.delegateHeight / 2 + x: contentItem.width / 2 + y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2 } } |