From b0cf820bef0699934f61af686598f751115e44f6 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 20 Jul 2017 05:24:18 +0300 Subject: [PATCH] mapwidget.qml: move the new map type toggle on top of the map Signed-off-by: Lubomir I. Ivanov --- mobile-widgets/qml/MapWidget.qml | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mobile-widgets/qml/MapWidget.qml b/mobile-widgets/qml/MapWidget.qml index 96dab8004..345288d25 100644 --- a/mobile-widgets/qml/MapWidget.qml +++ b/mobile-widgets/qml/MapWidget.qml @@ -112,28 +112,28 @@ Item { mapHelper.model.selectedUuid = 0 animateMapZoomOut() } + } - Image { - id: toggleImage - x: 10; y: x - source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite") + Image { + id: toggleImage + x: 10; y: x + source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite") - SequentialAnimation { - id: toggleImageAnimation - PropertyAnimation { - target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120; - } - PropertyAnimation { - target: toggleImage; property: "scale"; from: 0.8; to: 1.0; duration: 80; - } + SequentialAnimation { + id: toggleImageAnimation + PropertyAnimation { + target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120; } + PropertyAnimation { + target: toggleImage; property: "scale"; from: 0.8; to: 1.0; duration: 80; + } + } - MouseArea { - anchors.fill: parent - onClicked: { - map.activeMapType = map.activeMapType === map.mapType.SATELLITE ? map.mapType.STREET : map.mapType.SATELLITE - toggleImageAnimation.restart() - } + MouseArea { + anchors.fill: parent + onClicked: { + map.activeMapType = map.activeMapType === map.mapType.SATELLITE ? map.mapType.STREET : map.mapType.SATELLITE + toggleImageAnimation.restart() } } }