Merge branch '0.7.0-dev' of https://github.com/Nheko-Reborn/nheko into 0.7.0-dev-bugfix-71

1 files changed, 9 insertions, 10 deletions

diff --git a/src/UserInfoWidget.cpp b/src/UserInfoWidget.cpp

index cc0c0a82..7a910340 100644
--- a/src/UserInfoWidget.cpp
+++ b/src/UserInfoWidget.cpp
@@ -53,10 +53,9 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
         textLayout_->setSpacing(widgetMargin / 2);
         textLayout_->setContentsMargins(widgetMargin * 2, widgetMargin, widgetMargin, widgetMargin);
 
-        userAvatar_ = new Avatar(this);
+        userAvatar_ = new Avatar(this, fontHeight * 2.5);
         userAvatar_->setObjectName("userAvatar");
         userAvatar_->setLetter(QChar('?'));
-        userAvatar_->setSize(fontHeight * 2.5);
 
         QFont nameFont;
         nameFont.setPointSizeF(nameFont.pointSizeF() * 1.1);
@@ -136,14 +135,6 @@ UserInfoWidget::reset()
 }
 
 void
-UserInfoWidget::setAvatar(const QImage &img)
-{
-        avatar_image_ = img;
-        userAvatar_->setImage(img);
-        update();
-}
-
-void
 UserInfoWidget::setDisplayName(const QString &name)
 {
         if (name.isEmpty())
@@ -161,6 +152,14 @@ UserInfoWidget::setUserId(const QString &userid)
 {
         user_id_ = userid;
         userIdLabel_->setText(userid);
+        update();
+}
+
+void
+UserInfoWidget::setAvatar(const QString &url)
+{
+        userAvatar_->setImage(url);
+        update();
 }
 
 void