From 628775adaebf3ff464bace90f3b886f67d547e98 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Wed, 22 May 2019 11:51:04 +0200
Subject: [PATCH] Properly handle full thermal image display

---
 src/FlightDisplay/FlightDisplayViewVideo.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml
index 734ee10..3aea979 100644
--- a/src/FlightDisplay/FlightDisplayViewVideo.qml
+++ b/src/FlightDisplay/FlightDisplayViewVideo.qml
@@ -34,7 +34,7 @@ Item {
     property bool   _hasZoom:           _camera && _camera.hasZoom
     property int    _fitMode:           QGroundControl.settingsManager.videoSettings.videoFit.rawValue
 
-    property double _thermalHeightFactor: 0.666 //-- TODO
+    property double _thermalHeightFactor: 0.85 //-- TODO
 
     Rectangle {
         id:             noVideo
@@ -83,7 +83,7 @@ Item {
             anchors.centerIn: parent
             receiver:       _videoReceiver
             display:        _videoReceiver && _videoReceiver.videoSurface
-            visible:        _videoReceiver && _videoReceiver.videoRunning
+            visible:        _videoReceiver && _videoReceiver.videoRunning && !(QGroundControl.videoManager.hasThermal && _camera.thermalMode === QGCCameraControl.THERMAL_FULL)
             Connections {
                 target:         _videoReceiver
                 onImageFileChanged: {
@@ -127,7 +127,7 @@ Item {
         Item {
             id:                 thermalItem
             width:              height * QGroundControl.videoManager.thermalAspectRatio
-            height:             _camera ? (_camera.thermalMode === QGCCameraControl.THERMAL_PIP ? ScreenTools.defaultFontPixelHeight * 12 : parent.height * _thermalHeightFactor) : 0
+            height:             _camera ? (_camera.thermalMode === QGCCameraControl.THERMAL_FULL ? parent.height : (_camera.thermalMode === QGCCameraControl.THERMAL_PIP ? ScreenTools.defaultFontPixelHeight * 12 : parent.height * _thermalHeightFactor)) : 0
             anchors.centerIn:   parent
             visible:            QGroundControl.videoManager.hasThermal && _camera.thermalMode !== QGCCameraControl.THERMAL_OFF
             function pipOrNot() {