rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'color_generation_string' into 'master' 

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
parent 70972d9ebd 0a833b6e9b
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; return hash;
} }
QString QColor
utils::generateContrastingHexColor(const QString &input, const QString &background) utils::generateContrastingHexColor(const QString &input, const QColor &backgroundCol)
{ {
const QColor backgroundCol(background); const qreal backgroundLum = luminance(backgroundCol);
const qreal backgroundLum = luminance(background);
// Create a color for the input // Create a color for the input
auto hash = hashQString(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 //! Generate a color (matching #RRGGBB) that has an acceptable contrast to background that is based
//! on the input string. //! on the input string.
QString QColor
generateContrastingHexColor(const QString &input, const QString &background); generateContrastingHexColor(const QString &input, const QColor &background);
//! Given two luminance values, compute the contrast ratio between them. //! Given two luminance values, compute the contrast ratio between them.
qreal qreal

3
src/timeline/TimelineViewManager.cpp
View File

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