Commit 18c6a430 authored by Don Gagne's avatar Don Gagne

Merge pull request #3141 from DonLakeFlyer/RadioCalScroll

Radio cal scroll
parents 1be9b3a6 fd855c19
...@@ -254,10 +254,14 @@ QGCView { ...@@ -254,10 +254,14 @@ QGCView {
// Main view Qml starts here // Main view Qml starts here
QGCFlickable {
anchors.fill: parent
contentHeight: Math.max(leftColumn.height, rightColumn.height)
clip: true
// Left side column // Left side column
Column { Column {
id: leftColumn id: leftColumn
anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: columnSpacer.left anchors.right: columnSpacer.left
spacing: 10 spacing: 10
...@@ -580,5 +584,6 @@ QGCView { ...@@ -580,5 +584,6 @@ QGCView {
} }
} // Column - Channel Monitor } // Column - Channel Monitor
} // Column - Right Column } // Column - Right Column
} // QGCFlickable
} // QGCViewPanel } // QGCViewPanel
} }
...@@ -44,7 +44,7 @@ MapQuickItem { ...@@ -44,7 +44,7 @@ MapQuickItem {
MissionItemIndexLabel { MissionItemIndexLabel {
id: _label id: _label
isCurrentItem: _isCurrentItem isCurrentItem: _isCurrentItem
label: missionItem.abbreviation label: missionItem ? missionItem.abbreviation : ""
onClicked: _item.clicked() onClicked: _item.clicked()
property bool _isCurrentItem: missionItem ? missionItem.isCurrentItem : false property bool _isCurrentItem: missionItem ? missionItem.isCurrentItem : false
......
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