From 1251d89ef0577c9d450a8581d52dd94b67a45075 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 7 Apr 2021 20:42:53 -0400 Subject: use discord's default avatars instead of placeholder --- windows/profilewindow.cpp | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'windows/profilewindow.cpp') diff --git a/windows/profilewindow.cpp b/windows/profilewindow.cpp index d6ce320..58f3b28 100644 --- a/windows/profilewindow.cpp +++ b/windows/profilewindow.cpp @@ -47,23 +47,21 @@ ProfileWindow::ProfileWindow(Snowflake user_id) static const bool show_animations = Abaddon::Get().GetSettings().GetShowAnimations(); auto &img = Abaddon::Get().GetImageManager(); m_avatar.property_pixbuf() = img.GetPlaceholder(64); - if (user.HasAvatar()) { - auto icon_cb = [this](const Glib::RefPtr &pb) { - set_icon(pb); + auto icon_cb = [this](const Glib::RefPtr &pb) { + set_icon(pb); + }; + img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(icon_cb, *this)); + + if (show_animations && user.HasAnimatedAvatar()) { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf_animation() = pb; }; - img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(icon_cb, *this)); - - if (show_animations && user.HasAnimatedAvatar()) { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf_animation() = pb; - }; - img.LoadAnimationFromURL(user.GetAvatarURL("gif", "64"), 64, 64, sigc::track_obj(cb, *this)); - } else { - auto cb = [this](const Glib::RefPtr &pb) { - m_avatar.property_pixbuf() = pb->scale_simple(64, 64, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this)); - } + img.LoadAnimationFromURL(user.GetAvatarURL("gif", "64"), 64, 64, sigc::track_obj(cb, *this)); + } else { + auto cb = [this](const Glib::RefPtr &pb) { + m_avatar.property_pixbuf() = pb->scale_simple(64, 64, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL(user.GetAvatarURL("png", "64"), sigc::track_obj(cb, *this)); } m_username.set_markup(user.GetEscapedString()); -- cgit v1.2.3