From 55696a58995b5541b0ef0e74395098bd9b3284ed Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 20 Sep 2016 17:09:59 -0700 Subject: [PATCH] Fix joystick coloring --- src/FlightDisplay/FlightDisplayView.qml | 2 ++ src/FlightDisplay/VirtualJoystick.qml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index d66428385..85faa00b0 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -245,6 +245,8 @@ QGCView { anchors.horizontalCenter: widgetsLoader.horizontalCenter source: "qrc:/qml/VirtualJoystick.qml" active: QGroundControl.virtualTabletJoystick + + property bool useLightColors: root.isBackgroundDark } } } diff --git a/src/FlightDisplay/VirtualJoystick.qml b/src/FlightDisplay/VirtualJoystick.qml index 25702921b..07248d6df 100644 --- a/src/FlightDisplay/VirtualJoystick.qml +++ b/src/FlightDisplay/VirtualJoystick.qml @@ -17,7 +17,7 @@ import QGroundControl.Palette 1.0 import QGroundControl.Vehicle 1.0 Item { - QGCMapPalette { id: mapPal; lightColors: !isBackgroundDark } + //property bool useLightColors - Must be passed in from loaded Timer { interval: 40 // 25Hz, same as real joystick rate @@ -39,7 +39,7 @@ Item { width: parent.height height: parent.height yAxisThrottle: true - lightColors: !isBackgroundDark + lightColors: useLightColors } JoystickThumbPad { @@ -50,6 +50,6 @@ Item { anchors.bottom: parent.bottom width: parent.height height: parent.height - lightColors: !isBackgroundDark + lightColors: useLightColors } } -- 2.22.0