Browse Source

Fix instrument panel position when multi-vehicle radios visible

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
98221f29a1
  1. 20
      src/FlightDisplay/FlightDisplayView.qml

20
src/FlightDisplay/FlightDisplayView.qml

@ -331,7 +331,7 @@ QGCView { @@ -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 { @@ -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 { @@ -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

Loading…
Cancel
Save