Merge branch 'master' into qml-roomlist
This commit is contained in:
commit
7d5e82c888
16 changed files with 3439 additions and 605 deletions
|
|
@ -107,8 +107,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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue