Skip to content

Q
qgroundcontrol
Commit 3860173a authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Fix sizing within MissionItemStatus

parent 779d9702
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 71 deletions
src/MissionEditor/MissionEditor.qml
View file @ 3860173a
...@@ -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
......
src/MissionEditor/MissionItemStatus.qml
View file @ 3860173a
...@@ -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,75 +63,78 @@ Rectangle { ...@@ -63,75 +63,78 @@ Rectangle {
onClicked: _expanded = !_expanded onClicked: _expanded = !_expanded
} }
Grid { Row {
id: valueGrid anchors.fill: parent
anchors.margins: _margins anchors.margins: _margins
anchors.left: parent.left spacing: _margins
anchors.top: parent.top
columns: 2
columnSpacing: _margins
QGCLabel { text: qsTr("Distance:") } Grid {
QGCLabel { text: _distanceText } id: valueGrid
columns: 2
columnSpacing: _margins
anchors.verticalCenter: parent.verticalCenter
QGCLabel { text: qsTr("Alt diff:") } QGCLabel { text: qsTr("Distance:") }
QGCLabel { text: _altText } QGCLabel { text: _distanceText }
QGCLabel { text: qsTr("Gradient:") } QGCLabel { text: qsTr("Alt diff:") }
QGCLabel { text: _gradientText } QGCLabel { text: _altText }
QGCLabel { text: qsTr("Azimuth:") } QGCLabel { text: qsTr("Gradient:") }
QGCLabel { text: _azimuthText } QGCLabel { text: _gradientText }
}
QGCFlickable { QGCLabel { text: qsTr("Azimuth:") }
anchors.leftMargin: _margins QGCLabel { text: _azimuthText }
anchors.rightMargin: _margins }
anchors.left: valueGrid.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
contentWidth: graphRow.width
clip: true
Row {
id: graphRow
anchors.top: parent.top
anchors.bottom: parent.bottom
spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
Repeater {
model: missionItems
Item {
height: graphRow.height
width: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio * 2
visible: object.specifiesCoordinate && !object.isStandaloneCoordinate
property real availableHeight: height - (ScreenTools.defaultFontPixelHeight * ScreenTools.smallFontPointRatio) - indicator.height
property bool graphAbsolute: true
MissionItemIndexLabel {
id: indicator
anchors.horizontalCenter: parent.horizontalCenter
y: availableHeight - (availableHeight * object.altPercent)
small: true
isCurrentItem: object.isCurrentItem
label: object.abbreviation
visible: object.relativeAltitude ? true : (object.homePosition || graphAbsolute)
}
/* QGCFlickable {
Taking these off for now since there really isn't room for the numbers anchors.leftMargin: _margins
QGCLabel { anchors.rightMargin: _margins
anchors.bottom: parent.bottom anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom
font.pointSize: ScreenTools.smallFontPointSize width: parent.width - valueGrid.width - (_margins * 2)
text: (object.relativeAltitude ? "" : "=") + object.coordinate.altitude.toFixed(0) contentWidth: graphRow.width
visible: _expanded
clip: true
Row {
id: graphRow
anchors.top: parent.top
anchors.bottom: parent.bottom
//anchors.margins: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
Repeater {
model: missionItems
Item {
height: graphRow.height
width: indicator.width
visible: object.specifiesCoordinate && !object.isStandaloneCoordinate
property real availableHeight: height - indicator.height
property bool graphAbsolute: true
MissionItemIndexLabel {
id: indicator
anchors.horizontalCenter: parent.horizontalCenter
y: availableHeight - (availableHeight * object.altPercent)
small: true
isCurrentItem: object.isCurrentItem
label: object.abbreviation
visible: object.relativeAltitude ? true : (object.homePosition || graphAbsolute)
}
/*
Taking these off for now since there really isn't room for the numbers
QGCLabel {
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
font.pointSize: ScreenTools.smallFontPointSize
text: (object.relativeAltitude ? "" : "=") + object.coordinate.altitude.toFixed(0)
}
*/
} }
*/
} }
} }
} }
......
src/QmlControls/MissionItemIndexLabel.qml
View file @ 3860173a
...@@ -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