Merge branch 'master' into qml-roomlist

This commit is contained in:
Nicolas Werner 2021-06-12 15:05:07 +02:00
commit 7d5e82c888
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
16 changed files with 3439 additions and 605 deletions

View file

@ -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);
}