procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use HSL color space for accent colors.

This commit is contained in:
John Preston 2019-08-26 17:08:33 +03:00
parent 44d156760e
commit 38e4daacd4
7 changed files with 133 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Telegram/Resources/day-blue.tdesktop-theme
View File

Binary file not shown.

BIN
Telegram/Resources/night-green.tdesktop-theme
View File

Binary file not shown.

BIN
Telegram/Resources/night.tdesktop-theme
View File

Binary file not shown.

2
Telegram/SourceFiles/window/themes/window_theme_editor.cpp
View File

@ -334,7 +334,7 @@ Fn<void()> Editor::Inner::exportCallback() {
} }
void Editor::Inner::filterRows(const QString &query) { void Editor::Inner::filterRows(const QString &query) {
if (query == ":sort-by-accent-distance") { if (query == ":sort-for-accent") {
sortByAccentDistance(); sortByAccentDistance();
filterRows(QString()); filterRows(QString());
return; return;

24
Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
View File

@ -395,16 +395,22 @@ bool EditorBlock::feedDescription(const QString &name, const QString &descriptio
} }
void EditorBlock::sortByDistance(const QColor &to) { void EditorBlock::sortByDistance(const QColor &to) {
auto toHue = qreal(); auto toHue = int();
auto toSaturation = qreal(); auto toSaturation = int();
auto toLightness = qreal(); auto toLightness = int();
to.getHsvF(&toHue, &toSaturation, &toLightness); to.getHsl(&toHue, &toSaturation, &toLightness);
ranges::sort(_data, ranges::less(), [&](const Row &row) { ranges::sort(_data, ranges::less(), [&](const Row &row) {
auto fromHue = qreal(); auto fromHue = int();
auto fromSaturation = qreal(); auto fromSaturation = int();
auto fromLightness = qreal(); auto fromLightness = int();
row.value().getHsvF(&fromHue, &fromSaturation, &fromLightness); row.value().getHsl(&fromHue, &fromSaturation, &fromLightness);
return (toSaturation > 0.01) ? std::abs(fromHue - toHue) : 1.; if (!row.copyOf().isEmpty() && row.copyOf() != "windowBgActive") {
return 365;
}
const auto a = std::abs(fromHue - toHue);
const auto b = 360 + fromHue - toHue;
const auto c = 360 + toHue - fromHue;
return std::min(a, std::min(b, c));
}); });
} }

197
Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
View File

@ -65,7 +65,7 @@ const auto kColorizeIgnoredKeys = base::flat_set<QLatin1String>{ {
qstr("mediaviewFileBlueCornerFg"), qstr("mediaviewFileBlueCornerFg"),
} }; } };
QColor Color(str_const hex) { QColor qColor(str_const hex) {
Expects(hex.size() == 6); Expects(hex.size() == 6);
const auto component = [](char a, char b) { const auto component = [](char a, char b) {
@ -87,20 +87,38 @@ QColor Color(str_const hex) {
component(hex[4], hex[5])); component(hex[4], hex[5]));
}; };
Colorizer::Color cColor(str_const hex) {
const auto q = qColor(hex);
auto hue = int();
auto saturation = int();
auto lightness = int();
q.getHsl(&hue, &saturation, &lightness);
return Colorizer::Color{ hue, saturation, lightness };
}
} // namespace } // namespace
Colorizer ColorizerFrom(const EmbeddedScheme &scheme, const QColor &color) { Colorizer ColorizerFrom(const EmbeddedScheme &scheme, const QColor &color) {
using Color = Colorizer::Color;
auto result = Colorizer(); auto result = Colorizer();
result.ignoreKeys = kColorizeIgnoredKeys; result.ignoreKeys = kColorizeIgnoredKeys;
result.hueThreshold = 10; result.hueThreshold = 15;
scheme.accentColor.getHsv( scheme.accentColor.getHsl(
&result.wasHue, &result.was.hue,
&result.wasSaturation, &result.was.saturation,
&result.wasValue); &result.was.lightness);
color.getHsv( color.getHsl(
&result.nowHue, &result.now.hue,
&result.nowSaturation, &result.now.saturation,
&result.nowValue); &result.now.lightness);
switch (scheme.type) {
case EmbeddedType::DayBlue:
//result.keepContrast = base::flat_map<QLatin1String, Color>{ {
// { qstr("test"), cColor("aaaaaa") },
//} };
break;
}
return result; return result;
} }
@ -112,38 +130,41 @@ void Colorize(
auto color = QColor(int(r), int(g), int(b)); auto color = QColor(int(r), int(g), int(b));
auto hue = 0; auto hue = 0;
auto saturation = 0; auto saturation = 0;
auto value = 0; auto lightness = 0;
color.getHsv(&hue, &saturation, &value); color.getHsl(&hue, &saturation, &lightness);
const auto changeColor = std::abs(hue - colorizer->wasHue) const auto changeColor = std::abs(hue - colorizer->was.hue)
<= colorizer->hueThreshold; <= colorizer->hueThreshold;
const auto nowHue = hue + (colorizer->nowHue - colorizer->wasHue); if (!changeColor) {
const auto nowSaturation = ((saturation > colorizer->wasSaturation) return;
&& (colorizer->nowSaturation > colorizer->wasSaturation)) }
? (((colorizer->nowSaturation * (255 - colorizer->wasSaturation)) const auto nowHue = hue + (colorizer->now.hue - colorizer->was.hue);
+ ((saturation - colorizer->wasSaturation) const auto nowSaturation = ((saturation > colorizer->was.saturation)
* (255 - colorizer->nowSaturation))) && (colorizer->now.saturation > colorizer->was.saturation))
/ (255 - colorizer->wasSaturation)) ? (((colorizer->now.saturation * (255 - colorizer->was.saturation))
: ((saturation != colorizer->wasSaturation) + ((saturation - colorizer->was.saturation)
&& (colorizer->wasSaturation != 0)) * (255 - colorizer->now.saturation)))
? ((saturation * colorizer->nowSaturation) / (255 - colorizer->was.saturation))
/ colorizer->wasSaturation) : ((saturation != colorizer->was.saturation)
: colorizer->nowSaturation; && (colorizer->was.saturation != 0))
const auto nowValue = (value > colorizer->wasValue) ? ((saturation * colorizer->now.saturation)
? (((colorizer->nowValue * (255 - colorizer->wasValue)) / colorizer->was.saturation)
+ ((value - colorizer->wasValue) : colorizer->now.saturation;
* (255 - colorizer->nowValue))) const auto nowLightness = (lightness > colorizer->was.lightness)
/ (255 - colorizer->wasValue)) ? (((colorizer->now.lightness * (255 - colorizer->was.lightness))
: (value < colorizer->wasValue) + ((lightness - colorizer->was.lightness)
? ((value * colorizer->nowValue) * (255 - colorizer->now.lightness)))
/ colorizer->wasValue) / (255 - colorizer->was.lightness))
: colorizer->nowValue; : (lightness < colorizer->was.lightness)
? ((lightness * colorizer->now.lightness)
/ colorizer->was.lightness)
: colorizer->now.lightness;
auto nowR = 0; auto nowR = 0;
auto nowG = 0; auto nowG = 0;
auto nowB = 0; auto nowB = 0;
QColor::fromHsv( QColor::fromHsl(
changeColor ? ((nowHue + 360) % 360) : hue, ((nowHue + 360) % 360),
changeColor ? nowSaturation : saturation, nowSaturation,
nowValue nowLightness
).getRgb(&nowR, &nowG, &nowB); ).getRgb(&nowR, &nowG, &nowB);
r = uchar(nowR); r = uchar(nowR);
g = uchar(nowG); g = uchar(nowG);
@ -198,46 +219,46 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
return { return {
EmbeddedScheme{ EmbeddedScheme{
EmbeddedType::DayBlue, EmbeddedType::DayBlue,
Color("7ec4ea"), qColor("7ec4ea"),
Color("d7f0ff"), qColor("d7f0ff"),
Color("ffffff"), qColor("ffffff"),
Color("d7f0ff"), qColor("d7f0ff"),
Color("ffffff"), qColor("ffffff"),
tr::lng_settings_theme_blue, tr::lng_settings_theme_blue,
":/gui/day-blue.tdesktop-theme", ":/gui/day-blue.tdesktop-theme",
Color("40a7e3") qColor("40a7e3")
}, },
EmbeddedScheme{ EmbeddedScheme{
EmbeddedType::Default, EmbeddedType::Default,
Color("90ce89"), qColor("90ce89"),
Color("eaffdc"), qColor("eaffdc"),
Color("ffffff"), qColor("ffffff"),
Color("eaffdc"), qColor("eaffdc"),
Color("ffffff"), qColor("ffffff"),
tr::lng_settings_theme_classic, tr::lng_settings_theme_classic,
QString() QString()
}, },
EmbeddedScheme{ EmbeddedScheme{
EmbeddedType::Night, EmbeddedType::Night,
Color("485761"), qColor("485761"),
Color("5ca7d4"), qColor("5ca7d4"),
Color("6b808d"), qColor("6b808d"),
Color("6b808d"), qColor("6b808d"),
Color("5ca7d4"), qColor("5ca7d4"),
tr::lng_settings_theme_midnight, tr::lng_settings_theme_midnight,
":/gui/night.tdesktop-theme", ":/gui/night.tdesktop-theme",
Color("5288c1") qColor("5288c1")
}, },
EmbeddedScheme{ EmbeddedScheme{
EmbeddedType::NightGreen, EmbeddedType::NightGreen,
Color("485761"), qColor("485761"),
Color("75bfb5"), qColor("75bfb5"),
Color("6b808d"), qColor("6b808d"),
Color("6b808d"), qColor("6b808d"),
Color("75bfb5"), qColor("75bfb5"),
tr::lng_settings_theme_matrix, tr::lng_settings_theme_matrix,
":/gui/night-green.tdesktop-theme", ":/gui/night-green.tdesktop-theme",
Color("3fc1b0") qColor("3fc1b0")
}, },
}; };
} }
@ -246,41 +267,41 @@ std::vector<QColor> DefaultAccentColors(EmbeddedType type) {
switch (type) { switch (type) {
case EmbeddedType::DayBlue: case EmbeddedType::DayBlue:
return { return {
//Color("3478f5"), //qColor("3478f5"),
Color("58bfe8"), qColor("58bfe8"),
Color("58b040"), qColor("58b040"),
Color("da73a2"), qColor("da73a2"),
Color("e28830"), qColor("e28830"),
Color("9073e7"), qColor("9073e7"),
Color("c14126"), qColor("c14126"),
Color("71829c"), qColor("71829c"),
Color("e3b63e"), qColor("e3b63e"),
}; };
case EmbeddedType::Default: case EmbeddedType::Default:
return {}; return {};
case EmbeddedType::Night: case EmbeddedType::Night:
return { return {
//Color("3478f5"), //qColor("3478f5"),
Color("58bfe8"), qColor("58bfe8"),
Color("58b040"), qColor("58b040"),
Color("da73a2"), qColor("da73a2"),
Color("e28830"), qColor("e28830"),
Color("9073e7"), qColor("9073e7"),
Color("c14126"), qColor("c14126"),
Color("71829c"), qColor("71829c"),
Color("e3b63e"), qColor("e3b63e"),
}; };
case EmbeddedType::NightGreen: case EmbeddedType::NightGreen:
return { return {
Color("3478f5"), qColor("3478f5"),
//Color("58bfe8"), //qColor("58bfe8"),
Color("58b040"), qColor("58b040"),
Color("da73a2"), qColor("da73a2"),
Color("e28830"), qColor("e28830"),
Color("9073e7"), qColor("9073e7"),
Color("c14126"), qColor("c14126"),
Color("71829c"), qColor("71829c"),
Color("e3b63e"), qColor("e3b63e"),
}; };
} }
Unexpected("Type in Window::Theme::AccentColors."); Unexpected("Type in Window::Theme::AccentColors.");

14
Telegram/SourceFiles/window/themes/window_themes_embedded.h
View File

@ -48,14 +48,16 @@ private:
}; };
struct Colorizer { struct Colorizer {
int wasHue = 0; struct Color {
int wasSaturation = 0; int hue = 0;
int wasValue = 0; int saturation = 0;
int nowHue = 0; int lightness = 0;
int nowSaturation = 0; };
int nowValue = 0;
int hueThreshold = 0; int hueThreshold = 0;
Color was;
Color now;
base::flat_set<QLatin1String> ignoreKeys; base::flat_set<QLatin1String> ignoreKeys;
base::flat_map<QLatin1String, Color> keepContrast;
}; };
[[nodiscard]] Colorizer ColorizerFrom( [[nodiscard]] Colorizer ColorizerFrom(