From d8f34f39c5d456ddcdef3fbd6571ccc1aa02b1e8 Mon Sep 17 00:00:00 2001
From: Valentin Platzgummer <valentin.platzgummer@ymail.com>
Date: Wed, 16 Oct 2019 21:23:25 +0200
Subject: [PATCH] merge with remote master

---
 src/FlightDisplay/FlightDisplayView.qml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 6a4e25ceb..bf3c12120 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -510,18 +510,18 @@ 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)
+            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
+        }
 
         FlightDisplayWimaMenu {
             id: wimaMenu
-- 
2.22.0