diff --git a/res/controllers/CueColorsReference.svg b/res/controllers/CueColorsReference.svg
new file mode 100644
index 000000000000..7189ffaf0de4
--- /dev/null
+++ b/res/controllers/CueColorsReference.svg
@@ -0,0 +1,250 @@
+
+
+
+
diff --git a/src/util/color/color.h b/src/util/color/color.h
index df6eea05c60b..aa333778dcf4 100644
--- a/src/util/color/color.h
+++ b/src/util/color/color.h
@@ -38,7 +38,7 @@ namespace Color {
// If the baseColor is darker than the global threshold,
// returns a lighter color, otherwise returns a darker color.
- static inline QColor chooseContrastColor(QColor baseColor) {
+ static QColor chooseContrastColor(QColor baseColor) {
// Will produce a color that is 60% brighter.
static const int iLighterFactor = 160;
// We consider a hsv color dark if its value is <= 20% of max value
diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h
index 0d9bc054c807..14278ce71f69 100644
--- a/src/util/color/predefinedcolorsset.h
+++ b/src/util/color/predefinedcolorsset.h
@@ -19,59 +19,53 @@ class PredefinedColorsSet final {
0
);
const PredefinedColorPointer red = std::make_shared(
- QColor("#E6194B"),
+ QColor("#c50a08"),
QLatin1String("Red"),
QObject::tr("Red"),
1
);
const PredefinedColorPointer green = std::make_shared(
- QColor("#3CB44B"),
+ QColor("#32be44"),
QLatin1String("Green"),
QObject::tr("Green"),
2
);
- const PredefinedColorPointer yellow = std::make_shared(
- QColor("#FFE119"),
- QLatin1String("Yellow"),
- QObject::tr("Yellow"),
- 3
- );
const PredefinedColorPointer blue = std::make_shared(
- QColor("#4363D8"),
+ QColor("#0044ff"),
QLatin1String("Blue"),
QObject::tr("Blue"),
+ 3
+ );
+ const PredefinedColorPointer yellow = std::make_shared(
+ QColor("#f8d200"),
+ QLatin1String("Yellow"),
+ QObject::tr("Yellow"),
4
);
const PredefinedColorPointer cyan = std::make_shared(
- QColor("#42D4F4"),
- QLatin1String("Cyan"),
- QObject::tr("Cyan"),
+ QColor("#42d4f4"),
+ QLatin1String("Celeste"),
+ QObject::tr("Celeste"),
5
);
const PredefinedColorPointer magenta = std::make_shared(
- QColor("#F032E6"),
- QLatin1String("Magenta"),
- QObject::tr("Magenta"),
+ QColor("#af00cc"),
+ QLatin1String("Purple"),
+ QObject::tr("Purple"),
6
);
const PredefinedColorPointer pink = std::make_shared(
- QColor("#FABEBE"),
+ QColor("#fca6d7"),
QLatin1String("Pink"),
QObject::tr("Pink"),
7
);
- const PredefinedColorPointer teal = std::make_shared(
- QColor("#469990"),
- QLatin1String("Teal"),
- QObject::tr("Teal"),
+ const PredefinedColorPointer white = std::make_shared(
+ QColor("#f2f2ff"),
+ QLatin1String("White"),
+ QObject::tr("White"),
8
);
- const PredefinedColorPointer grey = std::make_shared(
- QColor("#A9A9A9"),
- QLatin1String("Grey"),
- QObject::tr("Grey"),
- 9
- );
// The list of the predefined colors.
const QList allColors {
@@ -83,8 +77,7 @@ class PredefinedColorsSet final {
cyan,
magenta,
pink,
- teal,
- grey,
+ white,
};
PredefinedColorsSet()