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
99c062d3
Commit
99c062d3
authored
May 02, 2017
by
Don Gagne
Committed by
GitHub
May 02, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5075 from DonLakeFlyer/PlanToolbar
Plan toolbar: Adjust alignment to prevent overlap
parents
0a09bb4b
19296fe2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
PlanToolBar.qml
src/PlanView/PlanToolBar.qml
+10
-6
No files found.
src/PlanView/PlanToolBar.qml
View file @
99c062d3
...
...
@@ -138,20 +138,22 @@ Rectangle {
visible
:
false
}
RowLayout
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
spacing
:
_margins
*
2
GridLayout
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.leftMargin
:
_margins
anchors.rightMargin
:
_margins
anchors.left
:
logoRow
.
right
anchors.leftMargin
:
_margins
*
4
anchors.right
:
uploadButton
.
visible
?
uploadButton
.
left
:
parent
.
right
anchors.rightMargin
:
_margins
columnSpacing
:
0
//_margins
columns
:
3
GridLayout
{
anchors.verticalCenter
:
parent
.
verticalCenter
columns
:
8
rowSpacing
:
_rowSpacing
columnSpacing
:
_labelToValueSpacing
Layout.alignment
:
Qt
.
AlignHCenter
QGCLabel
{
text
:
qsTr
(
"
Selected Waypoint
"
)
...
...
@@ -206,6 +208,7 @@ Rectangle {
columns
:
5
rowSpacing
:
_rowSpacing
columnSpacing
:
_labelToValueSpacing
Layout.alignment
:
Qt
.
AlignHCenter
QGCLabel
{
text
:
qsTr
(
"
Total Mission
"
)
...
...
@@ -242,6 +245,7 @@ Rectangle {
columns
:
3
rowSpacing
:
_rowSpacing
columnSpacing
:
_labelToValueSpacing
Layout.alignment
:
Qt
.
AlignHCenter
QGCLabel
{
text
:
qsTr
(
"
Battery
"
)
...
...
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