Merge pull request #1591 from dogmaphobic/batteryStatusFix

Small battery status fix.
10 years ago · 6aa38d7d26
2 changed files with 2 additions and 1 deletions
--- a/src/QmlControls/MavManager.cc
+++ b/src/QmlControls/MavManager.cc
@ -57,7 +57,7 @@ MavManager::MavManager(QObject *parent)
				@@ -57,7 +57,7 @@ MavManager::MavManager(QObject *parent)
    , _refreshTimer(new QTimer(this))
    , _batteryVoltage(0.0)
    , _batteryPercent(0.0)
-    , _batteryConsumed(0.0)
+    , _batteryConsumed(-1.0)
    , _systemArmed(false)
    , _currentHeartbeatTimeout(0)
    , _waypointDistance(0.0)
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@ -552,6 +552,7 @@ Rectangle {
				@@ -552,6 +552,7 @@ Rectangle {
                    font.weight: Font.DemiBold
                    anchors.right: parent.right
                    anchors.rightMargin: getProportionalDimmension(6)
+                    anchors.verticalCenter: parent.verticalCenter
                    horizontalAlignment: Text.AlignRight
                    color: colorWhite
                }