Skip to content

Q
qgroundcontrol
Commit 99c062d3 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5075 from DonLakeFlyer/PlanToolbar 

Plan toolbar: Adjust alignment to prevent overlap
parents 0a09bb4b 19296fe2
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
src/PlanView/PlanToolBar.qml
View file @ 99c062d3
...@@ -138,20 +138,22 @@ Rectangle { ...@@ -138,20 +138,22 @@ Rectangle {
visible: false visible: false
} }
RowLayout { GridLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
spacing: _margins * 2 anchors.leftMargin: _margins
anchors.rightMargin: _margins
anchors.left: logoRow.right anchors.left: logoRow.right
anchors.leftMargin: _margins * 4
anchors.right: uploadButton.visible ? uploadButton.left : parent.right anchors.right: uploadButton.visible ? uploadButton.left : parent.right
anchors.rightMargin: _margins columnSpacing: 0//_margins
columns: 3
GridLayout { GridLayout {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
columns: 8 columns: 8
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter
QGCLabel { QGCLabel {
text: qsTr("Selected Waypoint") text: qsTr("Selected Waypoint")
...@@ -206,6 +208,7 @@ Rectangle { ...@@ -206,6 +208,7 @@ Rectangle {
columns: 5 columns: 5
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter
QGCLabel { QGCLabel {
text: qsTr("Total Mission") text: qsTr("Total Mission")
...@@ -242,6 +245,7 @@ Rectangle { ...@@ -242,6 +245,7 @@ Rectangle {
columns: 3 columns: 3
rowSpacing: _rowSpacing rowSpacing: _rowSpacing
columnSpacing: _labelToValueSpacing columnSpacing: _labelToValueSpacing
Layout.alignment: Qt.AlignHCenter
QGCLabel { QGCLabel {
text: qsTr("Battery") text: qsTr("Battery")
......
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