src/FlightDisplay/PreFlightCheckList.qml

@@ -19,10 +19,12 @@ import QGroundControl.Vehicle       1.0
 
 Rectangle {
     width:      mainColumn.width  + ScreenTools.defaultFontPixelWidth * 3
-    height:     mainColumn.height + ScreenTools.defaultFontPixelHeight
+    height:     Math.min(availableHeight - (_verticalMargin * 2), mainColumn.height + ScreenTools.defaultFontPixelHeight)
     color:      qgcPal.windowShade
     radius:     3
 
+    property real _verticalMargin: ScreenTools.defaultFontPixelHeight / 2
+
     Loader {
         id:     modelContainer
         source: "/checklists/DefaultChecklist.qml"
@@ -94,14 +96,24 @@ Rectangle {
         onTriggered: _handleGroupPassedChanged(index, true /* passed */)
     }
 
+    QGCFlickable {
+        id:                     flickable
+        anchors.topMargin:      _verticalMargin
+        anchors.bottomMargin:   _verticalMargin
+        anchors.leftMargin:     _horizontalMargin
+        anchors.rightMargin:    _horizontalMargin
+        anchors.fill:           parent
+        flickableDirection:     Flickable.VerticalFlick
+        contentWidth:           mainColumn.width
+        contentHeight:          mainColumn.height
+
+        property real _horizontalMargin:    1.5 * ScreenTools.defaultFontPixelWidth
+        property real _verticalMargin:      0.6 * ScreenTools.defaultFontPixelWidth
+
         Column {
             id:         mainColumn
             width:      40  * ScreenTools.defaultFontPixelWidth
             spacing:    0.8 * ScreenTools.defaultFontPixelWidth
-        anchors.left:           parent.left
-        anchors.top:            parent.top
-        anchors.topMargin:      0.6 * ScreenTools.defaultFontPixelWidth
-        anchors.leftMargin:     1.5 * ScreenTools.defaultFontPixelWidth
 
             function groupPassedChanged(index, passed) {
                 if (passed) {
@@ -146,4 +158,5 @@ Rectangle {
                 model:  modelContainer.item.model
             }
         }
+    }
 }