From 621f9bbd209a4e1907d850f97c36e80a1e963522 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Thu, 6 Aug 2020 19:42:37 -0700 Subject: [PATCH] Visual tweaks --- src/ui/toolbar/MainStatusIndicator.qml | 4 +--- src/ui/toolbar/MainToolBar.qml | 12 +----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/ui/toolbar/MainStatusIndicator.qml b/src/ui/toolbar/MainStatusIndicator.qml index aad3c406b..2b8ce97f8 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 bb429b8e5..bbe9633cd 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 -- 2.22.0