From af0131b65602d87f242083076f7260e5464fdc96 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Thu, 23 Aug 2018 20:46:07 -0700
Subject: [PATCH] Better sizing of instrument panel

---
 src/FlightDisplay/FlightDisplayViewWidgets.qml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index fc0c9d82b..1ae1388a5 100644
--- 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() {
-- 
2.22.0