Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
57fa325f
Commit
57fa325f
authored
Nov 29, 2015
by
Don Gagne
Browse files
Add QGCPalette.text color
parent
73b18544
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/QGCMapPalette.cc
View file @
57fa325f
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
#include
<QPalette>
#include
<QPalette>
QColor
QGCMapPalette
::
_thumbJoystick
[
QGCMapPalette
::
_cColorGroups
]
=
{
QColor
(
255
,
255
,
255
,
127
),
QColor
(
0
,
0
,
0
,
127
)
};
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
)
:
QGCMapPalette
::
QGCMapPalette
(
QObject
*
parent
)
:
QObject
(
parent
)
QObject
(
parent
)
...
...
src/QGCMapPalette.h
View file @
57fa325f
...
@@ -38,8 +38,10 @@ class QGCMapPalette : public QObject
...
@@ -38,8 +38,10 @@ class QGCMapPalette : public QObject
Q_PROPERTY
(
bool
lightColors
READ
lightColors
WRITE
setLightColors
NOTIFY
paletteChanged
)
Q_PROPERTY
(
bool
lightColors
READ
lightColors
WRITE
setLightColors
NOTIFY
paletteChanged
)
// The colors are:
// 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
)
Q_PROPERTY
(
QColor
thumbJoystick
READ
thumbJoystick
NOTIFY
paletteChanged
)
public:
public:
...
@@ -48,7 +50,8 @@ public:
...
@@ -48,7 +50,8 @@ public:
bool
lightColors
(
void
)
const
{
return
_lightColors
;
}
bool
lightColors
(
void
)
const
{
return
_lightColors
;
}
void
setLightColors
(
bool
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:
signals:
void
paletteChanged
(
void
);
void
paletteChanged
(
void
);
...
@@ -59,6 +62,7 @@ private:
...
@@ -59,6 +62,7 @@ private:
static
const
int
_cColorGroups
=
2
;
static
const
int
_cColorGroups
=
2
;
static
QColor
_thumbJoystick
[
_cColorGroups
];
static
QColor
_thumbJoystick
[
_cColorGroups
];
static
QColor
_text
[
_cColorGroups
];
};
};
#endif
#endif
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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