added color normalizer for dark theme

This commit is contained in:
fourtf
2017-01-18 01:04:54 +01:00
parent 670d25342d
commit fa049cf420
5 changed files with 153 additions and 6 deletions
+87
View File
@@ -1,3 +1,5 @@
#define LOOKUP_COLOR_COUNT 360
#include "colorscheme.h"
#include "QColor"
@@ -40,4 +42,89 @@ ColorScheme::setColors(float hue, float multiplyer)
ChatHeaderBorder = getColor(0, 0.1, 0.85);
ChatInputBackground = getColor(0, 0.1, 0.95);
ChatInputBorder = getColor(0, 0.1, 0.9);
// generate color lookuptable
// fillLookupTableValues(0, 0.1, 0.6, 1);
// fillLookupTableValues(0.1, 0.50, 1, 1);
// fillLookupTableValues(0.50, 0.65, 1, 0.5);
// fillLookupTableValues(0.65, 0.83, 0.5, 0.7);
// fillLookupTableValues(0.83, 1, 0.7, 0.6);
fillLookupTableValues(m_middleLookupTable, 0.000, 0.166, 0.66, 0.5);
fillLookupTableValues(m_middleLookupTable, 0.166, 0.333, 0.5, 0.55);
fillLookupTableValues(m_middleLookupTable, 0.333, 0.500, 0.55, 0.45);
fillLookupTableValues(m_middleLookupTable, 0.500, 0.666, 0.45, 0.80);
fillLookupTableValues(m_middleLookupTable, 0.666, 0.833, 0.80, 0.61);
fillLookupTableValues(m_middleLookupTable, 0.833, 1.000, 0.61, 0.66);
fillLookupTableValues(m_minLookupTable, 0.000, 0.166, 0.33, 0.23);
fillLookupTableValues(m_minLookupTable, 0.166, 0.333, 0.23, 0.27);
fillLookupTableValues(m_minLookupTable, 0.333, 0.500, 0.27, 0.23);
fillLookupTableValues(m_minLookupTable, 0.500, 0.666, 0.23, 0.50);
fillLookupTableValues(m_minLookupTable, 0.666, 0.833, 0.50, 0.30);
fillLookupTableValues(m_minLookupTable, 0.833, 1.000, 0.30, 0.33);
// for (int i = 0; i < LOOKUP_COLOR_COUNT; i++) {
// qInfo(QString::number(m_middleLookupTable[i]).toStdString().c_str());
// }
}
void ColorScheme::fillLookupTableValues(qreal (&array)[360], qreal from,
qreal to, qreal fromValue,
qreal toValue)
{
qreal diff = toValue - fromValue;
int start = from * LOOKUP_COLOR_COUNT;
int end = to * LOOKUP_COLOR_COUNT;
int length = end - start;
for (int i = 0; i < length; i++) {
array[start + i] = fromValue + (diff * ((qreal)i / length));
}
}
void
ColorScheme::normalizeColor(QColor &color)
{
// qreal l = color.lightnessF();
// qreal s = color.saturationF();
// qreal x = m_colorLookupTable[std::max(0, color.hue())];
// qreal newL = (l - 1) * x + 1;
// newL = s * newL + (1 - s) * l;
// newL = newL > 0.5 ? newL : newL / 2 + 0.25;
// color.setHslF(color.hueF(), s, newL);
qreal l = color.lightnessF();
qreal s = color.saturationF();
int h = std::max(0, color.hue());
qreal x = m_middleLookupTable[h];
x = s * 0.5 + (1 - s) * x;
qreal min = m_minLookupTable[h];
min = (1 - s) * 0.5 + s * min;
qreal newL;
if (l < x) {
newL = l * ((x - min) / x) + min;
// newL = (l * ((x - min) / x) + min);
// newL = (1 - s) * newL + s * l;
} else {
newL = l;
}
color.setHslF(color.hueF(), s, newL);
// qreal newL = (l - 1) * x + 1;
// newL = s * newL + (1 - s) * l;
// newL = newL > 0.5 ? newL : newL / 2 + 0.25;
// color.setHslF(color.hueF(), s, newL);
}