Skip to content

Q
qgroundcontrol
Commit 49998715 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5203 from DonLakeFlyer/Fixes 

Fixes
parents 09a0778d 44446e99
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/FlightDisplay/MultiVehicleList.qml
View file @ 49998715
......@@ -33,7 +33,7 @@ QGCListView {
delegate: Rectangle {
width: parent.width
height: innerColumn.y + innerColumn.height + _margin
color: qgcPal.buttonHighlight
color: qgcPal.missionItemEditor
opacity: 0.8
radius: _margin
......
src/PlanView/PlanToolBar.qml
View file @ 49998715
......@@ -57,6 +57,7 @@ Rectangle {
property real _missionTime: _missionValid ? missionTime : NaN
property int _batteryChangePoint: _controllerValid ? planMasterController.missionController.batteryChangePoint : -1
property int _batteriesRequired: _controllerValid ? planMasterController.missionController.batteriesRequired : -1
property bool _batteryInfoAvailable: _batteryChangePoint >= 0 || _batteriesRequired >= 0
property real _controllerProgressPct: _controllerValid ? planMasterController.missionController.progressPct : 0
property bool _syncInProgress: _controllerValid ? planMasterController.missionController.syncInProgress : false
......@@ -246,6 +247,7 @@ Rectangle {
rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter
visible: _batteryInfoAvailable
QGCLabel {
text: qsTr("Battery")
......
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