diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-03-27 14:41:00 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-02 12:10:42 +0000 |
| commit | b36d26bbddeff8bfe23b526612ce135b418ac9a8 (patch) | |
| tree | a9172cdd383817df8ed3297d7a07b3bb9cb044de /tests/auto/declarative_ui | |
| parent | 3cbd12a732d775dada857b9995a84c6fdc7b0bf1 (diff) | |
| download | qtlocation-b36d26bbddeff8bfe23b526612ce135b418ac9a8.tar.gz | |
Remove wheelAngleChanged signal from map api
Change-Id: Ifada1a0852fc431f48d8dbccbfa8555b90cb35f9
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests/auto/declarative_ui')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_mouse.qml | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index c49c2c1a..9db57c1e 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -98,13 +98,6 @@ Item { plugin: testPlugin; - property real lastWheelAngleDeltaX: 0 - property real lastWheelAngleDeltaY: 0 - onWheelAngleChanged: { - lastWheelAngleDeltaX = angleDelta.x; - lastWheelAngleDeltaY = angleDelta.y; - } - MouseArea { id: mouseUpper objectName: "mouseUpper" @@ -208,11 +201,7 @@ Item { SignalSpy {id: mouseOverlapperEnabledChangedSpy; target: mouseOverlapper; signalName: "enabledChanged"} - SignalSpy {id: mapWheelSpy; target: map; signalName: "wheelAngleChanged"} - function clear_data() { - map.lastWheelAngleDeltaX = 0 - map.lastWheelAngleDeltaY = 0 mouseUpperClickedSpy.clear() mouseLowerClickedSpy.clear() mouseOverlapperClickedSpy.clear() @@ -305,24 +294,29 @@ Item { clear_data() wait(500); // on map but without mouse area + var startZoomLevel = 6 + map.zoomLevel = startZoomLevel mouseWheel(map, 5, 5, 15, 5, Qt.LeftButton, Qt.NoModifiers) - compare(mapWheelSpy.count, 1) - compare(map.lastWheelAngleDeltaX, 15) - compare(map.lastWheelAngleDeltaY, 5) + //see QDeclarativeGeoMapGestureArea::handleWheelEvent + var endZoomLevel = startZoomLevel + 5 * 0.001 + compare(map.zoomLevel,endZoomLevel) + + map.zoomLevel = startZoomLevel mouseWheel(map, 5, 5, -15, -5, Qt.LeftButton, Qt.NoModifiers) - compare(mapWheelSpy.count, 2) - compare(map.lastWheelAngleDeltaX, -15) - compare(map.lastWheelAngleDeltaY, -5) + //see QDeclarativeGeoMapGestureArea::handleWheelEvent + endZoomLevel = startZoomLevel - 5 * 0.001 + compare(map.zoomLevel,endZoomLevel) + // on map on top of mouse area + map.zoomLevel = startZoomLevel mouseWheel(map, 55, 75, -30, -2, Qt.LeftButton, Qt.NoModifiers) - compare(mapWheelSpy.count, 3) - compare(map.lastWheelAngleDeltaX, -30) - compare(map.lastWheelAngleDeltaY, -2) + endZoomLevel = startZoomLevel - 2 * 0.001 + compare(map.zoomLevel,endZoomLevel) + // outside of map + map.zoomLevel = startZoomLevel mouseWheel(map, -100, -100, 40, 4, Qt.LeftButton, Qt.NoModifiers) - compare(mapWheelSpy.count, 3) - compare(map.lastWheelAngleDeltaX, -30) - compare(map.lastWheelAngleDeltaY, -2) + compare(map.zoomLevel,startZoomLevel) } function test_aaa_basic_properties() // _aaa_ to ensure execution first |