colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix member list in dms again

Browse Source
This commit is contained in:
ouwou
2023-09-22 19:58:38 -04:00
parent 7f891fba33
commit 8eb22ef73f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/memberlist.cpp
View File

@@ -60,12 +60,19 @@ void MemberList::UpdateMemberList() {
return; return;
} }
const static auto color_transparent = Gdk::RGBA("rgba(0,0,0,0)");
if (channel->IsDM()) { if (channel->IsDM()) {
for (const auto &user : channel->GetDMRecipients()) { for (const auto &user : channel->GetDMRecipients()) {
auto row = *m_model->append(); auto row_iter = m_model->append();
auto row = *row_iter;
row[m_columns.m_type] = MemberListRenderType::Member; row[m_columns.m_type] = MemberListRenderType::Member;
row[m_columns.m_id] = user.ID; row[m_columns.m_id] = user.ID;
row[m_columns.m_name] = user.GetDisplayNameEscaped(); row[m_columns.m_name] = user.GetDisplayNameEscaped();
row[m_columns.m_color] = color_transparent;
row[m_columns.m_av_requested] = false;
row[m_columns.m_pixbuf] = Abaddon::Get().GetImageManager().GetPlaceholder(16);
m_pending_avatars[user.ID] = row_iter;
} }
} }
@@ -110,8 +117,8 @@ void MemberList::UpdateMemberList() {
} }
const auto add_user = [this, &guild, &user_to_color](const UserData &user, const Gtk::TreeRow &parent) { const auto add_user = [this, &guild, &user_to_color](const UserData &user, const Gtk::TreeRow &parent) {
auto test = m_model->append(parent->children()); auto row_iter = m_model->append(parent->children());
auto row = *test; auto row = *row_iter;
row[m_columns.m_type] = MemberListRenderType::Member; row[m_columns.m_type] = MemberListRenderType::Member;
row[m_columns.m_id] = user.ID; row[m_columns.m_id] = user.ID;
row[m_columns.m_name] = user.GetDisplayNameEscaped(); row[m_columns.m_name] = user.GetDisplayNameEscaped();
@@ -120,11 +127,10 @@ void MemberList::UpdateMemberList() {
if (const auto iter = user_to_color.find(user.ID); iter != user_to_color.end()) { if (const auto iter = user_to_color.find(user.ID); iter != user_to_color.end()) {
row[m_columns.m_color] = IntToRGBA(iter->second); row[m_columns.m_color] = IntToRGBA(iter->second);
} else { } else {
const static auto transparent = Gdk::RGBA("rgba(0,0,0,0)"); row[m_columns.m_color] = color_transparent;
row[m_columns.m_color] = transparent;
} }
m_pending_avatars[user.ID] = test; m_pending_avatars[user.ID] = row_iter;
return test; return row_iter;
}; };
const auto add_role = [this](const RoleData &role) { const auto add_role = [this](const RoleData &role) {