d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make user colors a bit more vibrant

Browse source
This commit is contained in:
Nicolas Werner 2021-11-19 23:56:28 +01:00
parent 44cd873c12
commit 34a1b6267b
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Utils.cpp
View file

@ -32,8 +32,6 @@
using TimelineEvent = mtx::events::collections::TimelineEvents; using TimelineEvent = mtx::events::collections::TimelineEvents;
QHash<QString, QString> authorColors_;
template<class T, class Event> template<class T, class Event>
static DescInfo static DescInfo
createDescriptionInfo(const Event &event, const QString &localUser, const QString &displayName) createDescriptionInfo(const Event &event, const QString &localUser, const QString &displayName)
@ -661,7 +659,7 @@ utils::generateContrastingHexColor(const QString &input, const QColor &backgroun
// create a hue value based on the hash of the input. // create a hue value based on the hash of the input.
auto userHue = static_cast<int>(hash % 360); auto userHue = static_cast<int>(hash % 360);
// start with moderate saturation and lightness values. // start with moderate saturation and lightness values.
auto sat = 220; auto sat = 230;
auto lightness = 125; auto lightness = 125;
// converting to a QColor makes the luminance calc easier. // converting to a QColor makes the luminance calc easier.
@ -677,10 +675,10 @@ utils::generateContrastingHexColor(const QString &input, const QColor &backgroun
// try again and again until they do by modifying first // try again and again until they do by modifying first
// the lightness and then the saturation of the color. // the lightness and then the saturation of the color.
int iterationCount = 9; int iterationCount = 9;
while (contrast < 5) { while (contrast < 4.5) {
// if our lightness is at it's bounds, try changing // if our lightness is at it's bounds, try changing
// saturation instead. // saturation instead.
if (lightness == 242 || lightness == 13) { if (lightness >= 242 || lightness <= 13) {
qreal newSat = qBound(26.0, sat * 1.25, 242.0); qreal newSat = qBound(26.0, sat * 1.25, 242.0);
inputColor.setHsl(userHue, qFloor(newSat), lightness); inputColor.setHsl(userHue, qFloor(newSat), lightness);