From 816a82537abb306b269514345e8d5f0578135f8e Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 25 Feb 2016 10:51:00 -0800 Subject: [PATCH 1/2] Fix value picker display --- src/FlightMap/Widgets/InstrumentSwipeView.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml index 5a2fd17..2833bd8 100644 --- a/src/FlightMap/Widgets/InstrumentSwipeView.qml +++ b/src/FlightMap/Widgets/InstrumentSwipeView.qml @@ -17,6 +17,10 @@ Item { property real _margins: ScreenTools.defaultFontPixelWidth / 2 + function showPicker() { + valuesPage.showPicker() + } + ValuesWidget { id: valuesPage width: _root.width From 2961eebcb7ad691e4aac5b3aa628ba29c68e5ba2 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 25 Feb 2016 10:51:15 -0800 Subject: [PATCH 2/2] Only show gear if active vehicle --- src/FlightMap/Widgets/QGCInstrumentWidget.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml index 78c024a..f6bf0ba 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml @@ -29,6 +29,7 @@ This file is part of the QGROUNDCONTROL project import QtQuick 2.4 +import QGroundControl 1.0 import QGroundControl.Controls 1.0 import QGroundControl.ScreenTools 1.0 import QGroundControl.FactSystem 1.0 @@ -87,6 +88,8 @@ Rectangle { opacity: 0.5 width: attitude.width * 0.15 fillMode: Image.PreserveAspectFit + visible: QGroundControl.multiVehicleManager.activeVehicle + MouseArea { anchors.fill: parent hoverEnabled: true