From 07d998e54a115412d1b28dd692e8ffb3270e7731 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 29 Mar 2019 09:51:33 -0700 Subject: [PATCH] Fix toolbar logo visibility --- ChangeLog.md | 1 + src/ui/toolbar/GPSRTKIndicator.qml | 2 +- src/ui/toolbar/LinkIndicator.qml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index de9e9c84c..156bbfb09 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes. * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans. ### 3.5.1 - Not yet released +* Fix visibility of PX4/ArduPilot logo in toolbar * Fix tile set count but in OfflineMaps which would cause image and elevation tile set to have incorrect counts and be incorrectly marked as download incomplete. ### 3.5.0 - Stable diff --git a/src/ui/toolbar/GPSRTKIndicator.qml b/src/ui/toolbar/GPSRTKIndicator.qml index 767278bd6..38461c151 100644 --- a/src/ui/toolbar/GPSRTKIndicator.qml +++ b/src/ui/toolbar/GPSRTKIndicator.qml @@ -21,7 +21,7 @@ import QGroundControl.Palette 1.0 //-- GPS Indicator Item { id: satelitte - width: (gpsValuesColumn.x + gpsValuesColumn.width) * 1.1 + width: visible ? (gpsValuesColumn.x + gpsValuesColumn.width) * 1.1 : 0 anchors.top: parent.top anchors.bottom: parent.bottom visible: QGroundControl.gpsRtk.connected.value diff --git a/src/ui/toolbar/LinkIndicator.qml b/src/ui/toolbar/LinkIndicator.qml index a7238d44d..f66fc99ef 100644 --- a/src/ui/toolbar/LinkIndicator.qml +++ b/src/ui/toolbar/LinkIndicator.qml @@ -23,7 +23,8 @@ import QGroundControl.Vehicle 1.0 Item { anchors.top: parent.top anchors.bottom: parent.bottom - width: priorityLinkSelector.width + width: visible ? priorityLinkSelector.width : 0 + visible: _visible property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property bool _visible: false @@ -34,7 +35,6 @@ Item { font.pointSize: ScreenTools.mediumFontPointSize color: qgcPal.buttonText anchors.verticalCenter: parent.verticalCenter - visible: _visible Menu { id: linkSelectionMenu } -- 2.22.0