merge with remote/master

src/FlightDisplay/FlightDisplayView.qml

@@ -483,6 +483,20 @@ QGCView {
             }
         }
 
+//        Item {
+//            id: theItem
+//            anchors.right:      parent.right
+//            anchors.bottom:     parent.top
+//            z:                  1000
+//            visible:            true
+
+//            Text {
+//                id: theText
+//                text: qsTr("Hello World!")
+//                font.pointSize: 40
+//            }
+//        }
+
         Row {
             id:                     singleMultiSelector
             anchors.topMargin:      ScreenTools.toolbarHeight + _margins
@@ -510,25 +524,27 @@ QGCView {
             }
         }
 
-//        FlightDisplayViewWidgets {
-//            id:                 flightDisplayViewWidgets
-//            z:                  _panel.z + 4
-//            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
-//            anchors.left:       parent.left
-//            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
-//            anchors.bottom:     parent.bottom
-//            qgcView:            root
-//            useLightColors:     isBackgroundDark
-//            missionController:  _missionController
-//            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
-//        }
+        FlightDisplayViewWidgets {
+            id:                 flightDisplayViewWidgets
+            z:                  _panel.z + 4
+            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) - wimaMenu.height
+            anchors.left:       parent.left
+            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
+            anchors.top:        singleMultiSelector.bottom
+            qgcView:            root
+            useLightColors:     isBackgroundDark
+            missionController:  _missionController
+            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
+        }
 
         FlightDisplayWimaMenu {
             id: wimaMenu
-            z:                  _panel.z + 4
-            anchors.left:       parent.left
+            z:                  1000 //_panel.z + 4
             anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
-            anchors.bottom:     parent.bottom
+            anchors.top:        flightDisplayViewWidgets.bottom
+            visible:            true
+            height: 300
+            width: 200
         }
 
         //-------------------------------------------------------------------------

src/FlightDisplay/FlightDisplayWimaMenu.qml

@@ -18,15 +18,9 @@ import QGroundControl.Airmap        1.0
 Item {
     id: _root
 
-    Rectangle {
-        anchors.top:        parent.top
-        color:              "white"
-        height: 100
-        width: 200
-
-        QGCCheckBox {
-            id: enableWima
-            text: qsTr("WiMA")
-        }
+    Text {
+        id: enableWima
+        text: qsTr("WiMA")
+        font.pointSize: 40
     }
 }

src/main.cc

@@ -276,6 +276,7 @@ int main(int argc, char *argv[])
         if (!app->_initForNormalAppBoot()) {
             return -1;
         }
+
         exitCode = app->exec();
     }