lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-03 14:25:38 +02:00
Code Activity

utils: use accountPhoto when generating a swarm image

Browse source 
Change-Id: I1fd1181aeedc47114876e2f0355b076602ac6649
GitLab: #1050
This commit is contained in:
Sébastien Blin 2023-04-07 12:55:32 -04:00
parent 6c0bb455c7
commit eba6f8f361
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/conversationlistmodelbase.cpp
View file

@ -153,6 +153,8 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
Q_FOREACH (const auto& peerUri, model_->peersForConversation(item.uid))
try {
auto& accInfo = lrcInstance_->getCurrentAccountInfo();
if (peerUri == accInfo.profileInfo.uri)
return true; // Self account
auto contact = accInfo.contactModel->getContact(peerUri);
if (contact.isPresent)
return true;

10
src/app/utils.cpp
View file

@ -469,16 +469,20 @@ Utils::conversationAvatar(LRCInstance* instance,
auto members = convModel->peersForConversation(convId);
if (members.size() < 1)
return avatar;
auto getPhoto = [&](const auto& uri) {
return uri == accInfo.profileInfo.uri ? accountPhoto(instance, accountId, size)
: contactPhoto(instance, uri, size, "");
};
if (members.size() == 1) {
// Only member in the swarm or 1:1, draw only peer's avatar
auto peerAvatar = Utils::contactPhoto(instance, members[0], size, "");
auto peerAvatar = getPhoto(members[0]);
painter.drawImage(avatar.rect(), peerAvatar);
return avatar;
}
// Else, combine avatars
auto idx = 0;
auto peerAAvatar = Utils::contactPhoto(instance, members[0], size, "");
auto peerBAvatar = Utils::contactPhoto(instance, members[1], size, "");
auto peerAAvatar = getPhoto(members[0]);
auto peerBAvatar = getPhoto(members[1]);
peerAAvatar = Utils::halfCrop(peerAAvatar, true);
peerBAvatar = Utils::halfCrop(peerBAvatar, false);
painter.drawImage(avatar.rect(), peerAAvatar);