diff --git a/src/ui/toolbar/MainStatusIndicator.qml b/src/ui/toolbar/MainStatusIndicator.qml index aad3c406b397b3cd8ad0a444abde394762396a4a..2b8ce97f8726a999a46fb6e13bb17f94470225a1 100644 --- a/src/ui/toolbar/MainStatusIndicator.qml +++ b/src/ui/toolbar/MainStatusIndicator.qml @@ -84,14 +84,12 @@ Item { return mainStatusLabel._commLostText } if (_activeVehicle.armed) { + _mainStatusBGColor = "green" if (_activeVehicle.flying) { - _mainStatusBGColor = qgcPal.brandingPurple return mainStatusLabel._flyingText } else if (_activeVehicle.landing) { - _mainStatusBGColor = qgcPal.brandingPurple return mainStatusLabel._landingText } else { - _mainStatusBGColor = qgcPal.brandingPurple return mainStatusLabel._armedText } } else { diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index bb429b8e507046cf31a55a349ecdc2ca898128d7..bbe9633cdb9f1ca61d208ecf742cd67d41ade1c9 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -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 { id: toolsFlickable anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2 - anchors.left: separator1.right + anchors.left: viewButtonRow.right anchors.bottomMargin: 1 anchors.top: parent.top anchors.bottom: parent.bottom