Commit 80410d68 authored by Don Gagne's avatar Don Gagne

Fix layout of values

parent 91c556cf
...@@ -35,7 +35,7 @@ Rectangle { ...@@ -35,7 +35,7 @@ Rectangle {
property real expandedWidth ///< Width of control when expanded property real expandedWidth ///< Width of control when expanded
width: _expanded ? expandedWidth : _collapsedWidth width: _expanded ? expandedWidth : _collapsedWidth
height: azimuthLabel.y + azimuthLabel.height + _margins height: valueGrid.height + _margins
radius: ScreenTools.defaultFontPixelWidth radius: ScreenTools.defaultFontPixelWidth
color: qgcPal.window color: qgcPal.window
opacity: 0.80 opacity: 0.80
...@@ -43,7 +43,7 @@ Rectangle { ...@@ -43,7 +43,7 @@ Rectangle {
readonly property real margins: ScreenTools.defaultFontPixelWidth readonly property real margins: ScreenTools.defaultFontPixelWidth
property real _collapsedWidth: distanceLabel.width + (margins * 2) property real _collapsedWidth: valueGrid.width + (margins * 2)
property bool _expanded: true property bool _expanded: true
property real _distance: _statusValid ? _currentMissionItem.distance : 0 property real _distance: _statusValid ? _currentMissionItem.distance : 0
property real _altDifference: _statusValid ? _currentMissionItem.altDifference : 0 property real _altDifference: _statusValid ? _currentMissionItem.altDifference : 0
...@@ -63,39 +63,31 @@ Rectangle { ...@@ -63,39 +63,31 @@ Rectangle {
onClicked: _expanded = !_expanded onClicked: _expanded = !_expanded
} }
QGCLabel { Grid {
id: distanceLabel id: valueGrid
anchors.margins: _margins anchors.margins: _margins
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
text: "Distance: " + _distanceText columns: 2
} columnSpacing: _margins
QGCLabel { QGCLabel { text: "Distance:" }
id: altLabel QGCLabel { text: _distanceText }
anchors.left: distanceLabel.left
anchors.top: distanceLabel.bottom
text: "Alt diff: " + _altText
}
QGCLabel { QGCLabel { text: "Alt diff:" }
id: gradientLabel QGCLabel { text: _altText }
anchors.left: distanceLabel.left
anchors.top: altLabel.bottom QGCLabel { text: "Gradient:" }
text: "Gradient: " + _gradientText QGCLabel { text: _gradientText }
}
QGCLabel { QGCLabel { text: "Azimuth:" }
id: azimuthLabel QGCLabel { text: _azimuthText }
anchors.left: distanceLabel.left
anchors.top: gradientLabel.bottom
text: "Azimuth: " + _azimuthText
} }
QGCFlickable { QGCFlickable {
anchors.leftMargin: _margins anchors.leftMargin: _margins
anchors.rightMargin: _margins anchors.rightMargin: _margins
anchors.left: distanceLabel.right anchors.left: valueGrid.right
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
......
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