diff options
| author | Juha Vuolle <juha.vuolle@nokia.com> | 2011-12-21 18:49:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 04:56:42 +0100 |
| commit | 778bf2126327431c06d8bd767d1e2254a6639bab (patch) | |
| tree | 22d442ae78a36eab709428a08d8a37f15add190b /tests | |
| parent | 436c2ebcc6520c1797fa0f6632418615002b23be (diff) | |
| download | qtlocation-778bf2126327431c06d8bd767d1e2254a6639bab.tar.gz | |
Add polygon item mouse area support.
Change-Id: I072de0f11105abecee16a4507bfb4411d63d754c
Reviewed-by: David Laing <david.laing@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/applications/declarative_map/map3d.qml | 3 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item.qml | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml index 40f56be2..374d2d1f 100644 --- a/tests/applications/declarative_map/map3d.qml +++ b/tests/applications/declarative_map/map3d.qml @@ -334,8 +334,11 @@ Rectangle { MapMouseArea { id: mouseAreaOfMapPolygon anchors.fill: parent + hoverEnabled: true drag.target: parent onClicked: console.log('....[Polygon].... map mouse area of polygon clicked') + onEntered: parent.color = 'red' + onExited: parent.color = 'pink' } Column { spacing: 2 diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index f5e16da7..0785fe86 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -180,6 +180,11 @@ Item { Coordinate { latitude: 20; longitude: 10}, Coordinate { latitude: 15; longitude: 6} ] + MapMouseArea { + anchors.fill: parent + drag.target: parent + SignalSpy { id: preMapPolygonClicked; target: parent; signalName: "clicked" } + } SignalSpy {id: preMapPolygonPathChanged; target: parent; signalName: "pathChanged"} SignalSpy {id: preMapPolygonColorChanged; target: parent; signalName: "colorChanged"} SignalSpy {id: preMapPolygonBorderWidthChanged; target: parent.border; signalName: "widthChanged"} @@ -252,6 +257,11 @@ Item { point = map.toScreenPosition(preMapQuickItem.coordinate) mouseClick(map, point.x + 5, point.y + 5) compare(preMapQuickItemClicked.count, 1) + // click polygon + compare (preMapPolygonClicked.count, 0) + point = map.toScreenPosition(preMapPolygon.path[1]) + mouseClick(map, point.x - 5, point.y) + compare(preMapPolygonClicked.count, 1) // remove items and repeat clicks to verify they are gone map.clearMapItems() @@ -272,6 +282,9 @@ Item { point = map.toScreenPosition(preMapQuickItem.coordinate) mouseClick(map, point.x + 5, point.y + 5) compare(preMapQuickItemClicked.count, 0) + point = map.toScreenPosition(preMapPolygon.path[1]) + mouseClick(map, point.x - 5, point.y) + compare(preMapPolygonClicked.count, 0) // re-add items and verify they are back (without needing to pan map etc.) // note: addition order is significant @@ -297,6 +310,10 @@ Item { point = map.toScreenPosition(preMapQuickItem.coordinate) mouseClick(map, point.x + 5, point.y + 5) compare(preMapQuickItemClicked.count, 1) + point = map.toScreenPosition(preMapPolygon.path[1]) + mouseClick(map, point.x - 5, point.y) + compare(preMapPolygonClicked.count, 1) + // item clips to map. not sure if this is sensible test map.addMapItem(extMapCircle) @@ -491,6 +508,7 @@ Item { preMapRectClicked.clear() preMapCircleClicked.clear() preMapQuickItemClicked.clear() + preMapPolygonClicked.clear() preMapCircleCenterChanged.clear() preMapCircleColorChanged.clear() preMapCircleRadiusChanged.clear() |