From ad7c55c5f89d4cd7009fe7f54ed8fbf05275a518 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Fri, 10 Nov 2017 13:56:08 -0500 Subject: [PATCH 1/2] Use wordwrap on vehicle values --- src/FlightMap/Widgets/ValuePageWidget.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FlightMap/Widgets/ValuePageWidget.qml b/src/FlightMap/Widgets/ValuePageWidget.qml index 6d87e12..acf15cc 100644 --- a/src/FlightMap/Widgets/ValuePageWidget.qml +++ b/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 { From 21cff51cf1fb5379a67bcd4213b863b5c865a454 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Fri, 10 Nov 2017 14:12:13 -0500 Subject: [PATCH 2/2] Fix instrument widget width issues for 4k screens --- src/FlightDisplay/FlightDisplayViewWidgets.qml | 2 ++ src/QmlControls/ScreenTools.qml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 7f97511..4d61d87 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/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 } diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index d6df6c2..900186e 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/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()