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
57fa325f
Commit
57fa325f
authored
Nov 29, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add QGCPalette.text color
parent
73b18544
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
QGCMapPalette.cc
src/QGCMapPalette.cc
+1
-0
QGCMapPalette.h
src/QGCMapPalette.h
+6
-2
No files found.
src/QGCMapPalette.cc
View file @
57fa325f
...
...
@@ -27,6 +27,7 @@
#include <QPalette>
QColor
QGCMapPalette
::
_thumbJoystick
[
QGCMapPalette
::
_cColorGroups
]
=
{
QColor
(
255
,
255
,
255
,
127
),
QColor
(
0
,
0
,
0
,
127
)
};
QColor
QGCMapPalette
::
_text
[
QGCMapPalette
::
_cColorGroups
]
=
{
QColor
(
255
,
255
,
255
),
QColor
(
0
,
0
,
0
)
};
QGCMapPalette
::
QGCMapPalette
(
QObject
*
parent
)
:
QObject
(
parent
)
...
...
src/QGCMapPalette.h
View file @
57fa325f
...
...
@@ -38,8 +38,10 @@ class QGCMapPalette : public QObject
Q_PROPERTY
(
bool
lightColors
READ
lightColors
WRITE
setLightColors
NOTIFY
paletteChanged
)
// The colors are:
// thumbJoystick - Thumb joystick indicator
// text - Text color
// thumbJoystick - Thumb joystick indicator
Q_PROPERTY
(
QColor
text
READ
text
NOTIFY
paletteChanged
)
Q_PROPERTY
(
QColor
thumbJoystick
READ
thumbJoystick
NOTIFY
paletteChanged
)
public:
...
...
@@ -48,7 +50,8 @@ public:
bool
lightColors
(
void
)
const
{
return
_lightColors
;
}
void
setLightColors
(
bool
lightColors
);
QColor
thumbJoystick
(
void
)
const
{
return
_thumbJoystick
[
_lightColors
];
}
QColor
text
(
void
)
const
{
return
_text
[
_lightColors
];
}
QColor
thumbJoystick
(
void
)
const
{
return
_thumbJoystick
[
_lightColors
];
}
signals:
void
paletteChanged
(
void
);
...
...
@@ -59,6 +62,7 @@ private:
static
const
int
_cColorGroups
=
2
;
static
QColor
_thumbJoystick
[
_cColorGroups
];
static
QColor
_text
[
_cColorGroups
];
};
#endif
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