Merge pull request #4933 from DonLakeFlyer/ToolStripFixes

Tool strip fixes

src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc

@@ -170,6 +170,7 @@ QString PX4FirmwarePlugin::flightMode(uint8_t base_mode, uint32_t custom_mode) c
 
         if (!found) {
             qWarning() << "Unknown flight mode" << custom_mode;
+            return tr("Unknown %1:%2").arg(base_mode).arg(custom_mode);
         }
     } else {
         qWarning() << "PX4 Flight Stack flight mode without custom mode enabled?";

src/FlightDisplay/FlightDisplayView.qml

@@ -348,7 +348,7 @@ QGCView {
             z:                  _panel.z + 4
             title:              qsTr("Fly")
             maxHeight:          (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
-            buttonVisible:      [ guidedController.showTakeoff || !guidedController.showLand, guidedController.showLand, true, true, true, guidedController.smartShotsAvailable ]
+            buttonVisible:      [ guidedController.showTakeoff || !guidedController.showLand, guidedController.showLand && !guidedController.showTakeoff, true, true, true, guidedController.smartShotsAvailable ]
             buttonEnabled:      [ guidedController.showTakeoff, guidedController.showLand, guidedController.showRTL, guidedController.showPause, _anyActionAvailable, _anySmartShotAvailable ]
 
             property bool _anyActionAvailable: guidedController.showEmergenyStop || guidedController.showStartMission || guidedController.showResumeMission || guidedController.showChangeAlt || guidedController.showLandAbort

src/QmlControls/ToolStrip.qml

@@ -39,7 +39,7 @@ Rectangle {
     // whether to show or hide the optional elements on the fly.
 
     property bool _showOptionalElements:    true
-    property bool _needRecalc:              true
+    property bool _needRecalc:              false
 
     Component.onCompleted: recalcShowOptionalElements()
 
@@ -54,7 +54,6 @@ Rectangle {
         onDefaultFontPixelHeightChanged:    recalcShowOptionalElements()
     }
 
-    /*
     onHeightChanged: {
         if (_needRecalc) {
             _needRecalc = false
@@ -63,18 +62,13 @@ Rectangle {
             }
         }
     }
-    */
 
     function recalcShowOptionalElements() {
-        if (_showOptionalElements) {
-            if (maxHeight && height > maxHeight) {
-                _showOptionalElements = false
-            }
-        } else {
+        if (maxHeight > 0) {
+            _needRecalc = false
+            _showOptionalElements =  height <= maxHeight
             _needRecalc = true
-            _showOptionalElements = true
         }
-
     }
 
     QGCPalette { id: qgcPal }