diff options
Diffstat (limited to 'windows')
-rw-r--r-- | windows/guildsettings/memberspane.cpp | 10 | ||||
-rw-r--r-- | windows/profile/mutualfriendspane.cpp | 22 | ||||
-rw-r--r-- | windows/profilewindow.cpp | 30 |
3 files changed, 28 insertions, 34 deletions
diff --git a/windows/guildsettings/memberspane.cpp b/windows/guildsettings/memberspane.cpp index 8042639..4d5124e 100644 --- a/windows/guildsettings/memberspane.cpp +++ b/windows/guildsettings/memberspane.cpp @@ -98,12 +98,10 @@ GuildSettingsMembersListItem::GuildSettingsMembersListItem(const GuildData &guil auto &discord = Abaddon::Get().GetDiscordClient(); - if (member.User->HasAvatar()) { - if (member.User->HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) - m_avatar.SetURL(member.User->GetAvatarURL("gif", "32")); - else - m_avatar.SetURL(member.User->GetAvatarURL("png", "32")); - } + if (member.User->HasAnimatedAvatar() && Abaddon::Get().GetSettings().GetShowAnimations()) + m_avatar.SetURL(member.User->GetAvatarURL("gif", "32")); + else + m_avatar.SetURL(member.User->GetAvatarURL("png", "32")); DisplayTerm = member.User->Username + "#" + member.User->Discriminator; diff --git a/windows/profile/mutualfriendspane.cpp b/windows/profile/mutualfriendspane.cpp index e0d6fc4..7d30453 100644 --- a/windows/profile/mutualfriendspane.cpp +++ b/windows/profile/mutualfriendspane.cpp @@ -12,18 +12,16 @@ MutualFriendItem::MutualFriendItem(const UserData &user) const auto show_animations = Abaddon::Get().GetSettings().GetShowAnimations(); auto &img = Abaddon::Get().GetImageManager(); m_avatar.property_pixbuf() = img.GetPlaceholder(24); - if (user.HasAvatar()) { - if (user.HasAnimatedAvatar() && show_animations) { - auto cb = [this](const Glib::RefPtr<Gdk::PixbufAnimation> &pb) { - m_avatar.property_pixbuf_animation() = pb; - }; - img.LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 24, 24, sigc::track_obj(cb, *this)); - } else { - auto cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pb) { - m_avatar.property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); - }; - img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); - } + if (user.HasAnimatedAvatar() && show_animations) { + auto cb = [this](const Glib::RefPtr<Gdk::PixbufAnimation> &pb) { + m_avatar.property_pixbuf_animation() = pb; + }; + img.LoadAnimationFromURL(user.GetAvatarURL("gif", "32"), 24, 24, sigc::track_obj(cb, *this)); + } else { + auto cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pb) { + m_avatar.property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR); + }; + img.LoadFromURL(user.GetAvatarURL("png", "32"), sigc::track_obj(cb, *this)); } m_name.set_markup(user.GetEscapedBoldString<false>()); 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<Gdk::Pixbuf> &pb) { - set_icon(pb); + auto icon_cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &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<Gdk::PixbufAnimation> &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<Gdk::PixbufAnimation> &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<Gdk::Pixbuf> &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<Gdk::Pixbuf> &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()); |