Merge pull request #5904 from bluerobotics/formatting-fixes

Formatting fixes

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -41,6 +41,8 @@ Item {
     function getPreferredInstrumentWidth() {
         if(ScreenTools.isMobile) {
             return mainWindow.width * 0.25
+        } else if(ScreenTools.isHugeScreen) {
+            return mainWindow.width * 0.11
         }
         return ScreenTools.defaultFontPixelWidth * 30
     }

src/FlightMap/Widgets/ValuePageWidget.qml

@@ -82,7 +82,7 @@ Column {
             QGCLabel {
                 width:                  parent.width
                 horizontalAlignment:    Text.AlignHCenter
-                fontSizeMode:           Text.HorizontalFit
+                wrapMode:               Text.WordWrap
                 text:                   fact.shortDescription + (fact.units ? " (" + fact.units + ")" : "")
             }
             QGCLabel {
@@ -105,9 +105,9 @@ Column {
 
             QGCLabel {
                 width:                  parent.width
+                wrapMode:               Text.WordWrap
                 horizontalAlignment:    Text.AlignHCenter
                 font.pointSize:         ScreenTools.isTinyScreen ? ScreenTools.smallFontPointSize * 0.75 : ScreenTools.smallFontPointSize
-                fontSizeMode:           Text.HorizontalFit
                 text:                   fact.shortDescription
             }
             QGCLabel {

src/QmlControls/ScreenTools.qml

@@ -60,6 +60,7 @@ Item {
     property bool isDebug:          ScreenToolsController.isDebug
     property bool isTinyScreen:     (Screen.width / Screen.pixelDensity) < 120 // 120mm
     property bool isShortScreen:    ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example
+    property bool isHugeScreen:     Screen.width >= 1920*2
 
     readonly property real minTouchMillimeters: 10      ///< Minimum touch size in millimeters
     property real minTouchPixels:               0       ///< Minimum touch size in pixels
@@ -90,6 +91,10 @@ Item {
         }
     }
 
+    function printScreenStats() {
+        console.log('ScreenTools: Screen.width: ' + Screen.width + ' Screen.height: ' + Screen.height + ' Screen.pixelDensity: ' + Screen.pixelDensity)
+    }
+
     /// Returns the current x position of the mouse in global screen coordinates.
     function mouseX() {
         return ScreenToolsController.mouseX()