diff options
-rw-r--r-- | src/imports/controls/fusion/ComboBox.qml | 5 | ||||
-rw-r--r-- | src/imports/controls/imagine/ComboBox.qml | 8 | ||||
-rw-r--r-- | tests/auto/sanity/BLACKLIST | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index 0f87240e..ade1566b 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -81,7 +81,7 @@ T.ComboBox { enabled: control.editable autoScroll: control.editable - readOnly: control.popup.visible + readOnly: control.down inputMethodHints: control.inputMethodHints validator: control.validator @@ -140,7 +140,6 @@ T.ComboBox { } popup: T.Popup { - id: popup width: control.width height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin) topMargin: 6 @@ -151,7 +150,7 @@ T.ComboBox { contentItem: ListView { clip: true implicitHeight: contentHeight - model: control.popup.visible ? control.delegateModel : null + model: control.delegateModel currentIndex: control.highlightedIndex highlightRangeMode: ListView.ApplyRange highlightMoveDuration: 0 diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index ce23d1f8..6d9a1162 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/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST index 8066f40b..94e4fd32 100644 --- a/tests/auto/sanity/BLACKLIST +++ b/tests/auto/sanity/BLACKLIST @@ -2,8 +2,6 @@ * [attachedObjects:material/SwitchDelegate.qml] * -[ids:fusion/ComboBox.qml] -* [ids:imagine/BusyIndicator.qml] * [ids:imagine/DelayButton.qml] |