diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 10:44:05 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 12:14:43 +0000 |
commit | 2acf527d54049cfb17d1d2aaf4d77c97716e1dc6 (patch) | |
tree | 57c803313e941b13f8c58d30100425c6b43fd204 /tests/auto/controls/data/tst_combobox.qml | |
parent | 9529225c849ee8e697767350cbb08e5f2845681b (diff) |
Combo|SpinBox: fix wheel event propagation
Sync the behavior with Qt Widgets. Don't propagate wheel events when
reaching the end. The behavior was not nice, that a ScrollView
underneath started suddenly moving whilst these input controls had
input focus.
Task-number: QTBUG-66044
Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/controls/data/tst_combobox.qml')
-rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 30d6a93c..22b36725 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -80,6 +80,11 @@ TestCase { } } + Component { + id: mouseArea + MouseArea { } + } + function init() { // QTBUG-61225: Move the mouse away to avoid QQuickWindowPrivate::flushFrameSynchronousEvents() // delivering interfering hover events based on the last mouse position from earlier tests. For @@ -1042,24 +1047,34 @@ TestCase { } function test_wheel() { - var control = createTemporaryObject(comboBox, testCase, {model: 2, wheelEnabled: true}) + var ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100}) + verify(ma) + + var control = comboBox.createObject(ma, {model: 2, wheelEnabled: true}) verify(control) var delta = 120 + var spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"}) + verify(spy.valid) + mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) compare(control.currentIndex, 1) + compare(spy.count, 0) // no propagation // reached bounds -> no change mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) compare(control.currentIndex, 1) + compare(spy.count, 0) // no propagation mouseWheel(control, control.width / 2, control.height / 2, delta, delta) compare(control.currentIndex, 0) + compare(spy.count, 0) // no propagation // reached bounds -> no change mouseWheel(control, control.width / 2, control.height / 2, delta, delta) compare(control.currentIndex, 0) + compare(spy.count, 0) // no propagation } function test_activation_data() { |