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

Merge branch 'color_generation_string' into 'master'

Browse source 
Avoid unnecessary QColor -> QString conversions

See merge request nheko-reborn/nheko!7
This commit is contained in:
Joe Donofry 2021-06-08 23:16:15 +00:00
commit 6f1ba70340
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Utils.cpp
View file

@ -679,11 +679,10 @@ utils::hashQString(const QString &input)
return hash;
}
QString
utils::generateContrastingHexColor(const QString &input, const QString &background)
QColor
utils::generateContrastingHexColor(const QString &input, const QColor &backgroundCol)
{
const QColor backgroundCol(background);
const qreal backgroundLum = luminance(background);
const qreal backgroundLum = luminance(backgroundCol);
// Create a color for the input
auto hash = hashQString(input);

4
src/Utils.h
View file

@ -301,8 +301,8 @@ hashQString(const QString &input);
//! Generate a color (matching #RRGGBB) that has an acceptable contrast to background that is based
//! on the input string.
QString
generateContrastingHexColor(const QString &input, const QString &background);
QColor
generateContrastingHexColor(const QString &input, const QColor &background);
//! Given two luminance values, compute the contrast ratio between them.
qreal

3
src/timeline/TimelineViewManager.cpp
View file

@ -122,8 +122,7 @@ QColor
TimelineViewManager::userColor(QString id, QColor background)
{
if (!userColors.contains(id))
userColors.insert(
id, QColor(utils::generateContrastingHexColor(id, background.name())));
userColors.insert(id, QColor(utils::generateContrastingHexColor(id, background)));
return userColors.value(id);
}