diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:37:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:38:19 +0100 |
| commit | 08e6333450bc28c61fa804101df3ae8bef4e9568 (patch) | |
| tree | acb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/imagine | |
| parent | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff) | |
| parent | 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/ComboBox.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Tumbler.qml | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index eae8569e..fa22ab90 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -71,7 +71,7 @@ T.ComboBox { {"disabled": !control.enabled}, {"pressed": control.pressed}, {"editable": control.editable}, - {"open": control.popup.visible}, + {"open": control.down}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, {"hovered": control.hovered}, @@ -90,7 +90,7 @@ T.ComboBox { enabled: control.editable autoScroll: control.editable - readOnly: control.popup.visible + readOnly: control.down inputMethodHints: control.inputMethodHints validator: control.validator @@ -112,7 +112,7 @@ T.ComboBox { {"disabled": !control.enabled}, {"pressed": control.pressed}, {"editable": control.editable}, - {"open": control.popup.visible}, + {"open": control.down}, {"focused": control.visualFocus || (control.editable && control.activeFocus)}, {"mirrored": control.mirrored}, {"hovered": control.hovered}, @@ -142,7 +142,7 @@ T.ComboBox { contentItem: ListView { clip: true implicitHeight: contentHeight - model: control.popup.visible ? control.delegateModel : null + model: control.delegateModel currentIndex: control.highlightedIndex highlightMoveDuration: 0 diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index 7cd2b6a9..0fa8c137 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/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 } } |