Commit 58d4ff15 authored by Don Gagne's avatar Don Gagne

Merge pull request #1821 from DonLakeFlyer/MissionScroll

Add scrollbar to mission summary list
parents 6f295b67 2253402f
...@@ -374,22 +374,48 @@ Item { ...@@ -374,22 +374,48 @@ Item {
*/ */
} }
/// Mission item list // Mission item list
Row { ScrollView {
id: missionItemScroll
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
anchors.right: controlWidgets.left anchors.right: controlWidgets.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: missionItemRow.height + _scrollBarHeightAdjust
verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
opacity: 0.75
property bool _scrollBarShown: missionItemRow.width > missionItemScroll.width
property real _scrollBarHeightAdjust: _scrollBarShown ? (scrollBarHeight.height - scrollBarHeight.viewport.height) + 5 : 0
Row {
id: missionItemRow
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
Repeater { Repeater {
model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.missionItems : 0 model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.missionItems : 0
MissionItemSummary { MissionItemSummary {
opacity: 0.75
missionItem: modelData missionItem: modelData
} }
} }
} }
}
// This is used to determine the height of a horizontal scroll bar
ScrollView {
id: scrollBarHeight
x: 10000
y: 10000
width: 100
height: 100
Rectangle {
height: 50
width: 200
}
}
/// Map control widgets /// Map control widgets
Column { Column {
......
...@@ -13,7 +13,6 @@ Rectangle { ...@@ -13,7 +13,6 @@ Rectangle {
border.width: 2 border.width: 2
border.color: "white" border.color: "white"
color: "white" color: "white"
opacity: 0.75
radius: ScreenTools.defaultFontPixelWidth radius: ScreenTools.defaultFontPixelWidth
MissionItemIndexLabel { MissionItemIndexLabel {
......
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