From 59755a31f01d6e3c9400938f6107a82e521921f3 Mon Sep 17 00:00:00 2001 From: Donald Gagne Date: Wed, 15 Mar 2017 20:32:48 -0700 Subject: [PATCH] Turn off flick/an gestures when follow vehicle set --- src/FlightDisplay/FlightDisplayViewMap.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 6cb710d76..8fb459b75 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -27,6 +27,10 @@ FlightMap { anchors.fill: parent mapName: _mapName + gesture.acceptedGestures: _followVehicle ? + MapGestureArea.PinchGesture : + MapGestureArea.PinchGesture | MapGestureArea.PanGesture | MapGestureArea.FlickGesture + property alias missionController: missionController property var flightWidgets property var rightPanelWidth @@ -39,6 +43,8 @@ FlightMap { property int _retaskSequence: 0 property real _toolButtonTopMargin: parent.height - ScreenTools.availableHeight + (ScreenTools.defaultFontPixelHeight / 2) + property bool followVehicleConnection: _followVehicle ///< Only use to create connection on + Component.onCompleted: { QGroundControl.flightMapPosition = center QGroundControl.flightMapZoom = zoomLevel -- 2.22.0