diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2015-01-29 19:06:59 +1000 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-06 14:46:33 +0000 |
| commit | 521e03b50e6f4c89c5daffbc28a53598f4a02b03 (patch) | |
| tree | a31eff5f37fc91436d7245cd2ca7aa58d965d0fd /tests | |
| parent | 73de5f12a329b155b888b6aa42d059408e1e5202 (diff) | |
| download | qtlocation-521e03b50e6f4c89c5daffbc28a53598f4a02b03.tar.gz | |
Improve filtering of touch and mouse events.
This change is based on b34bee26c932b9f7579e99d1dca632cb8c47d85f which
was reverted by 7f1067c97f55da45ffe3da7ec91ad32a2bcef255 as it
introduced regressions on some platforms.
All synthesized mouse events are now ignored, map handles touch events
directly.
Improve mouse and touch id grabbing in gesture state machines.
Only accept left mouse button.
Only accept one type of input at a time. Touch input is preferred. If
mouse input is started before touch it will be cancelled. If mouse
input is started after it will be ignored.
Change-Id: I31c1c30a49fc747875d37a9e643c118f05d78772
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_mouse.qml | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index 0e2472c8..8841c45a 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -494,14 +494,21 @@ Item { compare(mouseUpper.lastWasHeld, false) compare(mouseUpper.lastX, 5) compare(mouseUpper.lastY, 5) // remember 20 offset of the mouse area - mousePress(map, 5, 26) + + mouseRelease(map, 5, 25) compare(mouseUpperPressedSpy.count, 1) + compare(mouseUpperReleasedSpy.count, 1) + compare(mouseLowerPressedSpy.count, 0) + compare(mouseLowerReleasedSpy.count, 0) + + mousePress(map, 5, 26) + compare(mouseUpperPressedSpy.count, 2) compare(mouseLowerPressedSpy.count, 0) compare(mouseOverlapperPressedSpy.count, 0) mouseRelease(map, 5, 26) - compare(mouseUpperPressedSpy.count, 1) - compare(mouseUpperReleasedSpy.count, 1) + compare(mouseUpperPressedSpy.count, 2) + compare(mouseUpperReleasedSpy.count, 2) compare(mouseLowerPressedSpy.count, 0) compare(mouseLowerReleasedSpy.count, 0) compare(mouseUpper.lastAccepted, true) @@ -512,7 +519,7 @@ Item { compare(mouseUpper.lastY, 6) // remember 20 offset of the mouse area mousePress(map, 5, 75) - compare(mouseUpperPressedSpy.count, 1) + compare(mouseUpperPressedSpy.count, 2) compare(mouseLowerPressedSpy.count, 1) compare(mouseOverlapperPressedSpy.count, 0) compare(mouseLower.lastAccepted, true) @@ -523,18 +530,19 @@ Item { compare(mouseLower.lastY, 25) // remember 50 offset of the mouse area mouseRelease(map, 5, 75) - compare(mouseUpperPressedSpy.count, 1) - compare(mouseUpperReleasedSpy.count, 1) + compare(mouseUpperPressedSpy.count, 2) + compare(mouseUpperReleasedSpy.count, 2) compare(mouseLowerPressedSpy.count, 1) compare(mouseLowerReleasedSpy.count, 1) + mousePress(map, 55, 75) - compare(mouseUpperPressedSpy.count, 1) + compare(mouseUpperPressedSpy.count, 2) compare(mouseLowerPressedSpy.count, 1) compare(mouseOverlapperPressedSpy.count, 1) compare(mouseOverlapperReleasedSpy.count, 0) mouseRelease(map, 55, 25) - compare(mouseUpperPressedSpy.count, 1) - compare(mouseUpperReleasedSpy.count, 1) + compare(mouseUpperPressedSpy.count, 2) + compare(mouseUpperReleasedSpy.count, 2) compare(mouseLowerPressedSpy.count, 1) compare(mouseLowerReleasedSpy.count, 1) compare(mouseOverlapperReleasedSpy.count, 1) |