src/VehicleSetup/FirmwareUpgrade.qml

@@ -152,7 +152,6 @@ SetupPage {
 
                 QGCViewDialog {
                     id: pixhawkFirmwareSelectDialog
-                    anchors.fill:   parent
 
                     property bool showFirmwareTypeSelection:    _advanced.checked
                     property bool px4Flow:                      controller.px4FlowBoard
@@ -303,8 +302,14 @@ SetupPage {
                         }
                     }
 
-                    Column {
+                    QGCFlickable {
                         anchors.fill:   parent
+                        contentHeight:  mainColumn.height
+
+                        Column {
+                            id:             mainColumn
+                            anchors.left:   parent.left
+                            anchors.right:  parent.right
                             spacing:        defaultTextHeight
 
                             QGCLabel {
@@ -443,7 +448,9 @@ SetupPage {
                                 width:      parent.width
                                 wrapMode:   Text.WordWrap
                                 visible:    showFirmwareTypeSelection
-                            text:       _singleFirmwareMode ?  qsTr("Select the standard version or one from the file system (previously downloaded):") : (px4Flow ? qsTr("Select which version of the firmware you would like to install:") : qsTr("Select which version of the above flight stack you would like to install:"))
+                                text:       _singleFirmwareMode ?  qsTr("Select the standard version or one from the file system (previously downloaded):") :
+                                                                  (px4Flow ? qsTr("Select which version of the firmware you would like to install:") :
+                                                                             qsTr("Select which version of the above flight stack you would like to install:"))
                             }
 
                             QGCComboBox {
@@ -451,6 +458,7 @@ SetupPage {
                                 anchors.left:   parent.left
                                 anchors.right:  parent.right
                                 visible:        showFirmwareTypeSelection
+                                textRole:       "text"
                                 model:          _singleFirmwareMode ? singleFirmwareModeTypeList : (px4Flow ? px4FlowTypeList : firmwareBuildTypeList)
                                 currentIndex:   controller.selectedFirmwareBuildType
 
@@ -484,6 +492,7 @@ SetupPage {
                                 visible:    firmwareWarningMessageVisible
                             }
                         } // Column
+                    } // QGCFLickable
                 } // QGCViewDialog
             } // Component - pixhawkFirmwareSelectDialogComponent