From 98221f29a139c4d953f6601a8fb0665df4758607 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 18 Jul 2017 13:49:08 -0700 Subject: [PATCH] Fix instrument panel position when multi-vehicle radios visible --- src/FlightDisplay/FlightDisplayView.qml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index b410685cf..d5af98568 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -331,7 +331,7 @@ QGCView { QGCRadioButton { exclusiveGroup: multiVehicleSelectorGroup - text: qsTr("Multi-Vehicle (WIP)") + text: qsTr("Multi-Vehicle") color: mapPal.text } } @@ -339,7 +339,7 @@ QGCView { FlightDisplayViewWidgets { id: flightDisplayViewWidgets z: _panel.z + 4 - height: ScreenTools.availableHeight + height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) anchors.left: parent.left anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.bottom: parent.bottom @@ -399,16 +399,16 @@ QGCView { } MultiVehicleList { - anchors.margins: _margins - anchors.top: singleMultiSelector.bottom - anchors.right: parent.right - anchors.bottom: parent.bottom - width: ScreenTools.defaultFontPixelWidth * 30 - visible: !singleVehicleView.checked - z: _panel.z + 4 + anchors.margins: _margins + anchors.top: singleMultiSelector.bottom + anchors.right: parent.right + anchors.bottom: parent.bottom + width: ScreenTools.defaultFontPixelWidth * 30 + visible: !singleVehicleView.checked + z: _panel.z + 4 + guidedActionsController: _guidedController } - //-- Virtual Joystick Loader { id: virtualJoystickMultiTouch -- 2.22.0