Better sizing of instrument panel

af0131b6 · Don Gagne · Lorenz Meier · e70b4b0f · af0131b6
Commit af0131b6 authored Aug 23, 2018 by Don Gagne Committed by Lorenz Meier Aug 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

FlightDisplayViewWidgets.qml src/FlightDisplay/FlightDisplayViewWidgets.qml +4 -6

No files found.
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -39,12 +39,10 @@ Item {
    QGCPalette    { id: qgcPal }

    function getPreferredInstrumentWidth() {
-        if(ScreenTools.isMobile) {
-            return mainWindow.width * 0.25
-        } else if(ScreenTools.isHugeScreen) {
-            return mainWindow.width * 0.11
-        }
-        return ScreenTools.defaultFontPixelWidth * 30
+        // Don't allow instrument panel to chew more than 1/4 of full window
+        var defaultWidth = ScreenTools.defaultFontPixelWidth * 30
+        var maxWidth = mainWindow.width * 0.25
+        return Math.min(maxWidth, defaultWidth)
    }

    function _setInstrumentWidget() {