From 2f52210d3d97feaebfb654b2a621ceda2e59af08 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 26 Mar 2017 13:22:07 +0200
Subject: Provide a default avatar

If the user doesn't have a custom avatar set, show a default avatar
instead of nothing. This fixes a misalignment in the tableview
between users with and without a custom avatar.

Since libqmatrixclient doesn't recognize yet if a user is online or offline,
just use the `user-available` standard [1] icon for now.

[1]: https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.htmli
---
 user.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/user.cpp b/user.cpp
index 7d5024e5..8f0968bb 100644
--- a/user.cpp
+++ b/user.cpp
@@ -25,6 +25,7 @@
 
 #include <QtCore/QTimer>
 #include <QtCore/QDebug>
+#include <QtGui/QIcon>
 #include <algorithm>
 
 using namespace QMatrixClient;
@@ -39,6 +40,7 @@ class User::Private
         Connection* connection;
 
         QPixmap avatar;
+        QIcon defaultIcon;
         QSize requestedSize;
         bool avatarValid;
         bool avatarOngoingRequest;
@@ -55,6 +57,7 @@ User::User(QString userId, Connection* connection)
     d->avatarValid = false;
     d->avatarOngoingRequest = false;
     d->q = this;
+    d->defaultIcon = QIcon::fromTheme(QStringLiteral("user-available"));
 }
 
 User::~User()
@@ -102,7 +105,13 @@ QPixmap User::croppedAvatar(int width, int height)
     }
 
     if( d->avatar.isNull() )
-        return d->avatar;
+    {
+        if (d->defaultIcon.isNull())
+            return d->avatar;
+
+        d->avatar = d->defaultIcon.pixmap(size);
+    }
+
     for (const QPixmap& p: d->scaledAvatars)
     {
         if (p.size() == size)
-- 
cgit v1.2.3