From 20ef634c71a26e1f8009f1a1354da47c06272dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 12 Dec 2017 22:22:56 -0200 Subject: [PATCH] QGCPipable: Only show popup icon in video MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - popup don't work with map - improve popup visible logic Signed-off-by: Patrick José Pereira --- src/FlightDisplay/FlightDisplayView.qml | 1 + src/QmlControls/QGCPipable.qml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 9daed693e..cb3df85fe 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/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() diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml index dfcd10be1..42bf24ef8 100644 --- a/src/QmlControls/QGCPipable.qml +++ b/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 -- 2.22.0