From 20458c5b0c6a3a7fe15ae06e34e09faa2d1b778f Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 11 Jun 2016 15:56:53 -0700
Subject: [PATCH] Use alternate instruments for small screen

---
 src/FlightDisplay/FlightDisplayView.qml        |  2 +-
 src/FlightDisplay/FlightDisplayViewWidgets.qml | 30 ++++++++++++++------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index e7dcfc7..f03e74c 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -223,7 +223,7 @@ QGCView {
 
         //-- Virtual Joystick
         Loader {
-            id:                         multiTouchItem
+            id:                         virtualJoystickMultiTouch
             z:                          _panel.z + 5
             width:                      parent.width  - (_flightVideoPipControl.width / 2)
             height:                     Math.min(ScreenTools.availableHeight * 0.25, ScreenTools.defaultFontPixelWidth * 16)
diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index 80c24f7..295d33d 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -27,9 +27,11 @@ Item {
 
     property alias guidedModeBar: _guidedModeBar
 
-    property var    _activeVehicle:         QGroundControl.multiVehicleManager.activeVehicle
-    property bool   _isSatellite:           _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
-    property bool   _lightWidgetBorders:    _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
+    property var    _activeVehicle:             QGroundControl.multiVehicleManager.activeVehicle
+    property bool   _isSatellite:               _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
+    property bool   _lightWidgetBorders:        _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
+    property bool   _useAlternateInstruments:   QGroundControl.virtualTabletJoystick || ScreenTools.isTinyScreen
+
 
     readonly property real _margins: ScreenTools.defaultFontPixelHeight / 2
 
@@ -94,7 +96,7 @@ Item {
         anchors.margins:        ScreenTools.defaultFontPixelHeight / 2
         anchors.right:          altitudeSlider.visible ? altitudeSlider.left : parent.right
         anchors.verticalCenter: parent.verticalCenter
-        visible:                !QGroundControl.virtualTabletJoystick
+        visible:                !_useAlternateInstruments
         size:                   getGadgetWidth()
         active:                 _activeVehicle != null
         heading:                _heading
@@ -113,8 +115,8 @@ Item {
         anchors.margins:        ScreenTools.defaultFontPixelHeight / 2
         anchors.top:            parent.top
         anchors.right:          altitudeSlider.visible ? altitudeSlider.left : parent.right
-        visible:                QGroundControl.virtualTabletJoystick
-        width:                  ScreenTools.isTinyScreen ? getGadgetWidth() * 2 : getGadgetWidth()
+        visible:                _useAlternateInstruments
+        width:                  ScreenTools.isTinyScreen ? getGadgetWidth() * 1.5 : getGadgetWidth()
         active:                 _activeVehicle != null
         heading:                _heading
         rollAngle:              _roll
@@ -126,14 +128,14 @@ Item {
     }
 
     ValuesWidget {
-        anchors.topMargin:  ScreenTools.defaultFontPixelHeight
-        anchors.top:        instrumentGadgetAlternate.bottom
-        anchors.left:       instrumentGadgetAlternate.left
-        width:              getGadgetWidth()
-        qgcView:            parent.parent.qgcView
-        textColor:          _isSatellite ? "white" : "black"
-        visible:            QGroundControl.virtualTabletJoystick
-        maxHeight:          multiTouchItem.y - y
+        anchors.topMargin:          ScreenTools.defaultFontPixelHeight
+        anchors.top:                instrumentGadgetAlternate.bottom
+        anchors.horizontalCenter:   instrumentGadgetAlternate.horizontalCenter
+        width:                      getGadgetWidth()
+        qgcView:                    parent.parent.qgcView
+        textColor:                  _isSatellite ? "white" : "black"
+        visible:                    _useAlternateInstruments
+        maxHeight:                  virtualJoystickMultiTouch.visible ? virtualJoystickMultiTouch.y - y : parent.height - anchors.margins - y
     }
 
     //-- Vertical Tool Buttons