Skip to content

Q
qgroundcontrol
Unverified Commit cf4bbcc9 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6049 from bluerobotics/mouseover 

Hide popup icon until mouseover
parents 9f6f5edb 66e8f14d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ cf4bbcc9
...@@ -341,7 +341,7 @@ QGCView { ...@@ -341,7 +341,7 @@ QGCView {
anchors.left: _panel.left anchors.left: _panel.left
anchors.bottom: _panel.bottom anchors.bottom: _panel.bottom
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
visible: QGroundControl.videoManager.hasVideo && !QGroundControl.videoManager.fullScreen visible: QGroundControl.videoManager.hasVideo && !QGroundControl.videoManager.fullScreen && _flightVideo.state != "popup"
isHidden: !_isPipVisible isHidden: !_isPipVisible
isDark: isBackgroundDark isDark: isBackgroundDark
enablePopup: _mainIsMap enablePopup: _mainIsMap
......
src/QmlControls/QGCPipable.qml
View file @ cf4bbcc9
...@@ -128,7 +128,7 @@ Item { ...@@ -128,7 +128,7 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
visible: !isHidden && !inPopup && !ScreenTools.isMobile && enablePopup visible: !isHidden && !inPopup && !ScreenTools.isMobile && enablePopup && pipMouseArea.containsMouse
height: ScreenTools.defaultFontPixelHeight * 2.5 height: ScreenTools.defaultFontPixelHeight * 2.5
width: ScreenTools.defaultFontPixelHeight * 2.5 width: ScreenTools.defaultFontPixelHeight * 2.5
sourceSize.height: height sourceSize.height: height
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment