Commit 3860173a authored by dogmaphobic's avatar dogmaphobic

Fix sizing within MissionItemStatus

parent 779d9702
...@@ -496,6 +496,7 @@ QGCView { ...@@ -496,6 +496,7 @@ QGCView {
orientation: ListView.Vertical orientation: ListView.Vertical
model: controller.visualItems model: controller.visualItems
cacheBuffer: height * 2 cacheBuffer: height * 2
clip: true
delegate: MissionItemEditor { delegate: MissionItemEditor {
missionItem: object missionItem: object
......
...@@ -35,8 +35,8 @@ Rectangle { ...@@ -35,8 +35,8 @@ 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: valueGrid.height + _margins height: valueGrid.height + (_margins * 2)
radius: ScreenTools.defaultFontPixelWidth radius: ScreenTools.defaultFontPixelWidth * 0.5
color: qgcPal.window color: qgcPal.window
opacity: 0.80 opacity: 0.80
clip: true clip: true
...@@ -63,13 +63,16 @@ Rectangle { ...@@ -63,13 +63,16 @@ Rectangle {
onClicked: _expanded = !_expanded onClicked: _expanded = !_expanded
} }
Row {
anchors.fill: parent
anchors.margins: _margins
spacing: _margins
Grid { Grid {
id: valueGrid id: valueGrid
anchors.margins: _margins
anchors.left: parent.left
anchors.top: parent.top
columns: 2 columns: 2
columnSpacing: _margins columnSpacing: _margins
anchors.verticalCenter: parent.verticalCenter
QGCLabel { text: qsTr("Distance:") } QGCLabel { text: qsTr("Distance:") }
QGCLabel { text: _distanceText } QGCLabel { text: _distanceText }
...@@ -87,17 +90,18 @@ Rectangle { ...@@ -87,17 +90,18 @@ Rectangle {
QGCFlickable { QGCFlickable {
anchors.leftMargin: _margins anchors.leftMargin: _margins
anchors.rightMargin: _margins anchors.rightMargin: _margins
anchors.left: valueGrid.right
anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: parent.width - valueGrid.width - (_margins * 2)
contentWidth: graphRow.width contentWidth: graphRow.width
visible: _expanded
clip: true clip: true
Row { Row {
id: graphRow id: graphRow
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
//anchors.margins: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
Repeater { Repeater {
...@@ -105,12 +109,10 @@ Rectangle { ...@@ -105,12 +109,10 @@ Rectangle {
Item { Item {
height: graphRow.height height: graphRow.height
width: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio * 2 width: indicator.width
visible: object.specifiesCoordinate && !object.isStandaloneCoordinate visible: object.specifiesCoordinate && !object.isStandaloneCoordinate
property real availableHeight: height - indicator.height
property real availableHeight: height - (ScreenTools.defaultFontPixelHeight * ScreenTools.smallFontPointRatio) - indicator.height
property bool graphAbsolute: true property bool graphAbsolute: true
MissionItemIndexLabel { MissionItemIndexLabel {
...@@ -136,4 +138,5 @@ Rectangle { ...@@ -136,4 +138,5 @@ Rectangle {
} }
} }
} }
}
} }
...@@ -19,22 +19,22 @@ Rectangle { ...@@ -19,22 +19,22 @@ Rectangle {
border.color: "white" border.color: "white"
color: isCurrentItem ? "green" : qgcPal.mapButtonHighlight color: isCurrentItem ? "green" : qgcPal.mapButtonHighlight
property real _width: small ? ScreenTools.smallFontPointSize * 1.5 : ScreenTools.mediumFontPointSize * 1.5 property real _width: small ? ScreenTools.defaultFontPixelHeight * ScreenTools.smallFontPointRatio * 1.75 : ScreenTools.defaultFontPixelHeight * 1.75
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
MouseArea {
anchors.fill: parent
onClicked: parent.clicked()
}
QGCLabel { QGCLabel {
id: _label id: _label
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: "white" color: "white"
font.pointSize: small ? ScreenTools.smallFontPointSize : ScreenTools.mediumFontPointSize font.pointSize: small ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize
} }
MouseArea {
anchors.fill: parent
onClicked: parent.clicked()
}
} }
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