Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
aa956db7
Commit
aa956db7
authored
Oct 19, 2016
by
Don Gagne
Committed by
GitHub
Oct 19, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4152 from DonLakeFlyer/BrandingImageVisibility
Fix brand image visibility calculation
parents
92a4eef8
9f4e47a2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+2
-2
No files found.
src/ui/toolbar/MainToolBar.qml
View file @
aa956db7
...
...
@@ -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
:
""
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment