Skip to content

Q
qgroundcontrol
Commit 98221f29 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Fix instrument panel position when multi-vehicle radios visible

parent f320ab0f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ 98221f29
...@@ -331,7 +331,7 @@ QGCView { ...@@ -331,7 +331,7 @@ QGCView {
QGCRadioButton { QGCRadioButton {
exclusiveGroup: multiVehicleSelectorGroup exclusiveGroup: multiVehicleSelectorGroup
text: qsTr("Multi-Vehicle (WIP)") text: qsTr("Multi-Vehicle")
color: mapPal.text color: mapPal.text
} }
} }
...@@ -339,7 +339,7 @@ QGCView { ...@@ -339,7 +339,7 @@ QGCView {
FlightDisplayViewWidgets { FlightDisplayViewWidgets {
id: flightDisplayViewWidgets id: flightDisplayViewWidgets
z: _panel.z + 4 z: _panel.z + 4
height: ScreenTools.availableHeight height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
anchors.left: parent.left anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
...@@ -399,16 +399,16 @@ QGCView { ...@@ -399,16 +399,16 @@ QGCView {
} }
MultiVehicleList { MultiVehicleList {
anchors.margins: _margins anchors.margins: _margins
anchors.top: singleMultiSelector.bottom anchors.top: singleMultiSelector.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: ScreenTools.defaultFontPixelWidth * 30 width: ScreenTools.defaultFontPixelWidth * 30
visible: !singleVehicleView.checked visible: !singleVehicleView.checked
z: _panel.z + 4 z: _panel.z + 4
guidedActionsController: _guidedController
} }
//-- Virtual Joystick //-- Virtual Joystick
Loader { Loader {
id: virtualJoystickMultiTouch id: virtualJoystickMultiTouch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment