Browse Source

Merge pull request #3141 from DonLakeFlyer/RadioCalScroll

Radio cal scroll
QGC4.4
Don Gagne 9 years ago
parent
commit
18c6a4307d
  1. 7
      src/AutoPilotPlugins/Common/RadioComponent.qml
  2. 2
      src/FlightMap/MapItems/MissionItemIndicator.qml

7
src/AutoPilotPlugins/Common/RadioComponent.qml

@ -254,10 +254,14 @@ QGCView { @@ -254,10 +254,14 @@ QGCView {
// Main view Qml starts here
QGCFlickable {
anchors.fill: parent
contentHeight: Math.max(leftColumn.height, rightColumn.height)
clip: true
// Left side column
Column {
id: leftColumn
anchors.top: parent.top
anchors.left: parent.left
anchors.right: columnSpacer.left
spacing: 10
@ -580,5 +584,6 @@ QGCView { @@ -580,5 +584,6 @@ QGCView {
}
} // Column - Channel Monitor
} // Column - Right Column
} // QGCFlickable
} // QGCViewPanel
}

2
src/FlightMap/MapItems/MissionItemIndicator.qml

@ -44,7 +44,7 @@ MapQuickItem { @@ -44,7 +44,7 @@ MapQuickItem {
MissionItemIndexLabel {
id: _label
isCurrentItem: _isCurrentItem
label: missionItem.abbreviation
label: missionItem ? missionItem.abbreviation : ""
onClicked: _item.clicked()
property bool _isCurrentItem: missionItem ? missionItem.isCurrentItem : false

Loading…
Cancel
Save