diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 15:19:14 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 15:42:41 +0000 |
| commit | d61567f3cfa100aeab865bd6b436de87970575f5 (patch) | |
| tree | 4eae3253554507344104e4a117e645ad102f272b | |
| parent | 842fa74658be458ef7c51f00901220d232ad8330 (diff) | |
Tumbler: cleanup internal IDs
We can already cleanup the internal IDs even if Tumbler doesn't
have deferred execution enabled.
Change-Id: Ide9a0a6c6d1680c6df6b968b5702a6270fea3326
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/Tumbler.qml | 10 | ||||
| -rw-r--r-- | src/imports/controls/material/Tumbler.qml | 10 | ||||
| -rw-r--r-- | src/imports/controls/universal/Tumbler.qml | 9 | ||||
| -rw-r--r-- | tests/auto/sanity/BLACKLIST | 6 |
4 files changed, 12 insertions, 23 deletions
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 3659e770..e9cbf97d 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -45,7 +45,6 @@ T.Tumbler { implicitHeight: 200 delegate: Text { - id: label text: modelData color: control.visualFocus ? Default.focusColor : Default.textDarkColor font: control.font @@ -55,15 +54,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 } } diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 9b1309ab..76e6124e 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -46,7 +46,6 @@ T.Tumbler { implicitHeight: 200 delegate: Text { - id: label text: modelData color: control.Material.foreground font: control.font @@ -56,15 +55,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 } } diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index 45bcb6c8..9da9d56e 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 } } diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index 112c9fba..42ad3448 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -2,9 +2,3 @@ * [attachedObjects:material/SwitchDelegate.qml] * -[ids:controls/Tumbler.qml] -* -[ids:material/Tumbler.qml] -* -[ids:universal/Tumbler.qml] -* |