Merge pull request #5879 from patrickelectric/video_update

QGCPipable: Only show popup icon in video

src/FlightDisplay/FlightDisplayView.qml

@@ -344,6 +344,7 @@ QGCView {
             visible:            QGroundControl.videoManager.hasVideo && !QGroundControl.videoManager.fullScreen
             isHidden:           !_isPipVisible
             isDark:             isBackgroundDark
+            enablePopup:        _mainIsMap
             onActivated: {
                 _mainIsMap = !_mainIsMap
                 setStates()

src/QmlControls/QGCPipable.qml

@@ -27,6 +27,7 @@ Item {
     property real minSize: 0.10
 
     property bool inPopup: false
+    property bool enablePopup: true
 
     signal  activated()
     signal  hideIt(bool state)
@@ -127,7 +128,7 @@ Item {
         fillMode:       Image.PreserveAspectFit
         anchors.left:   parent.left
         anchors.top:    parent.top
-        visible:        !isHidden && (ScreenTools.isMobile || pipMouseArea.containsMouse) && !inPopup && !ScreenTools.isMobile
+        visible:        !isHidden && !inPopup && !ScreenTools.isMobile && enablePopup
         height:         ScreenTools.defaultFontPixelHeight * 2.5
         width:          ScreenTools.defaultFontPixelHeight * 2.5
         sourceSize.height:  height