Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
187b860f
Commit
187b860f
authored
Sep 22, 2016
by
Don Gagne
Committed by
GitHub
Sep 22, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4068 from DonLakeFlyer/JoystickColor
Fix joystick coloring
parents
0bc63269
55696a58
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+2
-0
VirtualJoystick.qml
src/FlightDisplay/VirtualJoystick.qml
+3
-3
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
187b860f
...
...
@@ -245,6 +245,8 @@ QGCView {
anchors.horizontalCenter
:
widgetsLoader
.
horizontalCenter
source
:
"
qrc:/qml/VirtualJoystick.qml
"
active
:
QGroundControl
.
virtualTabletJoystick
property
bool
useLightColors
:
root
.
isBackgroundDark
}
}
}
src/FlightDisplay/VirtualJoystick.qml
View file @
187b860f
...
...
@@ -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
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment