Skip to content

Q
qgroundcontrol
Commit 621f9bbd authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent 04ae69ba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 14 deletions
src/ui/toolbar/MainStatusIndicator.qml
View file @ 621f9bbd
...@@ -84,14 +84,12 @@ Item { ...@@ -84,14 +84,12 @@ Item {
return mainStatusLabel._commLostText return mainStatusLabel._commLostText
} }
if (_activeVehicle.armed) { if (_activeVehicle.armed) {
_mainStatusBGColor = "green"
if (_activeVehicle.flying) { if (_activeVehicle.flying) {
_mainStatusBGColor = qgcPal.brandingPurple
return mainStatusLabel._flyingText return mainStatusLabel._flyingText
} else if (_activeVehicle.landing) { } else if (_activeVehicle.landing) {
_mainStatusBGColor = qgcPal.brandingPurple
return mainStatusLabel._landingText return mainStatusLabel._landingText
} else { } else {
_mainStatusBGColor = qgcPal.brandingPurple
return mainStatusLabel._armedText return mainStatusLabel._armedText
} }
} else { } else {
......
src/ui/toolbar/MainToolBar.qml
View file @ 621f9bbd
...@@ -106,20 +106,10 @@ Rectangle { ...@@ -106,20 +106,10 @@ Rectangle {
} }
} }
Rectangle {
id: separator1
anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: viewButtonRow.right
width: 1
color: qgcPal.text
}
QGCFlickable { QGCFlickable {
id: toolsFlickable id: toolsFlickable
anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2 anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2
anchors.left: separator1.right anchors.left: viewButtonRow.right
anchors.bottomMargin: 1 anchors.bottomMargin: 1
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
......
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