diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 36bc167c0f875484ee6467e9eb46d6314979215e..279b7dd5133f3fc710252dffd90774ae0adb95e6 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -216,15 +216,15 @@ Item { height: availableHeight } + //-- Virtual Joystick Item { id: multiTouchItem - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom + width: parent.width * 0.6 height: thumbAreaHeight visible: QGroundControl.virtualTabletJoystick + anchors.centerIn: parent - readonly property real thumbAreaHeight: parent.height / 4 + readonly property real thumbAreaHeight: Math.min(parent.height * 0.25, ScreenTools.defaultFontPixelWidth * 16) QGCMapPalette { id: mapPal; lightColors: !isBackgroundDark } @@ -302,7 +302,6 @@ Item { interval: 10 running: QGroundControl.virtualTabletJoystick repeat: true - onTriggered: { if (_activeVehicle) { _activeVehicle.virtualTabletJoystickValue(rightStick.xAxis, rightStick.yAxis, leftStick.xAxis, leftStick.yAxis) diff --git a/src/QGCMapPalette.cc b/src/QGCMapPalette.cc index 96487f45579854cd15460dd702e92368ebb73967..d1a169f226fde285dc1dff8edffc5bac8fe14a3e 100644 --- a/src/QGCMapPalette.cc +++ b/src/QGCMapPalette.cc @@ -26,7 +26,7 @@ #include #include -QColor QGCMapPalette::_thumbJoystick[QGCMapPalette::_cColorGroups] = { QColor("#ffffff"), QColor("#f000000") }; +QColor QGCMapPalette::_thumbJoystick[QGCMapPalette::_cColorGroups] = { QColor(255,255,255,127), QColor(0,0,0,127) }; QGCMapPalette::QGCMapPalette(QObject* parent) : QObject(parent) diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml index 03c43ece44252416c9b848b72f55afbfeab5825e..e20bf7cef782f46b2c3696888a1caa17b91ba4b1 100644 --- a/src/QmlControls/JoystickThumbPad.qml +++ b/src/QmlControls/JoystickThumbPad.qml @@ -5,9 +5,10 @@ import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 Rectangle { + id: _joyRoot radius: width / 2 border.color: mapPal.thumbJoystick - border.width: 2 + border.width: ScreenTools.defaultFontPixelWidth * 0.25 color: "transparent" property alias lightColors: mapPal.lightColors /// true: use light colors from QGCMapPalette for drawing