|
|
|
@ -222,7 +222,7 @@ QGCView {
@@ -222,7 +222,7 @@ QGCView {
|
|
|
|
|
z: _mainIsMap ? _panel.z + 1 : _panel.z + 2 |
|
|
|
|
anchors.left: _panel.left |
|
|
|
|
anchors.bottom: _panel.bottom |
|
|
|
|
visible: _mainIsMap || _isPipVisible |
|
|
|
|
visible: _mainIsMap || _isPipVisible && !QGroundControl.videoManager.fullScreen |
|
|
|
|
width: _mainIsMap ? _panel.width : _pipSize |
|
|
|
|
height: _mainIsMap ? _panel.height : _pipSize * (9/16) |
|
|
|
|
states: [ |
|
|
|
@ -300,7 +300,7 @@ QGCView {
@@ -300,7 +300,7 @@ QGCView {
|
|
|
|
|
anchors.left: _panel.left |
|
|
|
|
anchors.bottom: _panel.bottom |
|
|
|
|
anchors.margins: ScreenTools.defaultFontPixelHeight |
|
|
|
|
visible: QGroundControl.videoManager.hasVideo |
|
|
|
|
visible: QGroundControl.videoManager.hasVideo && !QGroundControl.videoManager.fullScreen |
|
|
|
|
isHidden: !_isPipVisible |
|
|
|
|
isDark: isBackgroundDark |
|
|
|
|
onActivated: { |
|
|
|
@ -349,7 +349,7 @@ QGCView {
@@ -349,7 +349,7 @@ QGCView {
|
|
|
|
|
qgcView: root |
|
|
|
|
useLightColors: isBackgroundDark |
|
|
|
|
missionController: _missionController |
|
|
|
|
visible: singleVehicleView.checked |
|
|
|
|
visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------- |
|
|
|
@ -357,6 +357,7 @@ QGCView {
@@ -357,6 +357,7 @@ QGCView {
|
|
|
|
|
Loader { |
|
|
|
|
id: flyViewOverlay |
|
|
|
|
z: flightDisplayViewWidgets.z + 1 |
|
|
|
|
visible: !QGroundControl.videoManager.fullScreen |
|
|
|
|
height: ScreenTools.availableHeight |
|
|
|
|
anchors.left: parent.left |
|
|
|
|
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right |
|
|
|
@ -373,7 +374,7 @@ QGCView {
@@ -373,7 +374,7 @@ QGCView {
|
|
|
|
|
anchors.right: _flightVideo.right |
|
|
|
|
height: ScreenTools.defaultFontPixelHeight * 2 |
|
|
|
|
width: height |
|
|
|
|
visible: QGroundControl.videoManager.videoReceiver.videoRunning && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue && !_isCamera |
|
|
|
|
visible: QGroundControl.videoManager.videoReceiver.videoRunning && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue && !_isCamera && !QGroundControl.videoManager.fullScreen |
|
|
|
|
opacity: 0.75 |
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
@ -407,7 +408,7 @@ QGCView {
@@ -407,7 +408,7 @@ QGCView {
|
|
|
|
|
anchors.right: parent.right |
|
|
|
|
anchors.bottom: parent.bottom |
|
|
|
|
width: ScreenTools.defaultFontPixelWidth * 30 |
|
|
|
|
visible: !singleVehicleView.checked |
|
|
|
|
visible: !singleVehicleView.checked && !QGroundControl.videoManager.fullScreen |
|
|
|
|
z: _panel.z + 4 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -418,7 +419,7 @@ QGCView {
@@ -418,7 +419,7 @@ QGCView {
|
|
|
|
|
z: _panel.z + 5 |
|
|
|
|
width: parent.width - (_flightVideoPipControl.width / 2) |
|
|
|
|
height: Math.min(ScreenTools.availableHeight * 0.25, ScreenTools.defaultFontPixelWidth * 16) |
|
|
|
|
visible: _virtualJoystick ? _virtualJoystick.value : false |
|
|
|
|
visible: (_virtualJoystick ? _virtualJoystick.value : false) && !QGroundControl.videoManager.fullScreen |
|
|
|
|
anchors.bottom: _flightVideoPipControl.top |
|
|
|
|
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 2 |
|
|
|
|
anchors.horizontalCenter: flightDisplayViewWidgets.horizontalCenter |
|
|
|
@ -431,7 +432,7 @@ QGCView {
@@ -431,7 +432,7 @@ QGCView {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ToolStrip { |
|
|
|
|
visible: _activeVehicle ? _activeVehicle.guidedModeSupported : true |
|
|
|
|
visible: (_activeVehicle ? _activeVehicle.guidedModeSupported : true) && !QGroundControl.videoManager.fullScreen |
|
|
|
|
id: toolStrip |
|
|
|
|
anchors.leftMargin: ScreenTools.defaultFontPixelWidth |
|
|
|
|
anchors.left: _panel.left |
|
|
|
|