Commit aa956db7 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4152 from DonLakeFlyer/BrandingImageVisibility

Fix brand image visibility calculation
parents 92a4eef8 9f4e47a2
......@@ -393,6 +393,7 @@ Rectangle {
property bool vehicleConnectionLost: activeVehicle ? activeVehicle.connectionLost : false
Loader {
id: indicatorLoader
source: activeVehicle && !parent.vehicleConnectionLost ? "MainToolBarIndicators.qml" : ""
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
......@@ -408,7 +409,6 @@ Rectangle {
anchors.right: disconnectButton.left
anchors.verticalCenter: parent.verticalCenter
visible: parent.vehicleConnectionLost
}
QGCButton {
......@@ -427,7 +427,7 @@ Rectangle {
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
visible: parent.x < x && !disconnectButton.visible && source != ""
visible: x > indicatorLoader.x + indicatorLoader.width && !disconnectButton.visible && source != ""
fillMode: Image.PreserveAspectFit
source: activeVehicle ? activeVehicle.brandImage : ""
}
......
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