d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a fancy loading spinner to the member list

Browse source
This commit is contained in:
Loren Burkholder 2021-06-11 18:53:32 -04:00
parent e1acf5d324
commit a76fc7d200
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/RoomMembers.qml
View file

@ -109,6 +109,13 @@ ApplicationWindow {
} }
} }
} }
footer: BusyIndicator {
// This is not a wonderful solution, but it is the best way to calculate whether
// all users are loaded while keeping canFetchMore() const
running: members.numUsersLoaded < members.memberCount
anchors.centerIn: parent
}
} }
} }
} }

15
src/MemberList.cpp
View file

@ -34,7 +34,10 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
} }
try { try {
addUsers(cache::getMembers(room_id_.toStdString())); auto members = cache::getMembers(room_id_.toStdString());
addUsers(members);
numUsersLoaded_ = members.size();
emit numUsersLoadedChanged();
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
nhlog::db()->critical("Failed to retrieve members from cache: {}", e.what()); nhlog::db()->critical("Failed to retrieve members from cache: {}", e.what());
} }
@ -83,11 +86,17 @@ bool
MemberList::canFetchMore(const QModelIndex &) const MemberList::canFetchMore(const QModelIndex &) const
{ {
const size_t numMembers = rowCount(); const size_t numMembers = rowCount();
return (numMembers > 1 && numMembers < info_.member_count); if (numMembers > 1 && numMembers < info_.member_count)
return true;
else
return false;
} }
void void
MemberList::fetchMore(const QModelIndex &) MemberList::fetchMore(const QModelIndex &)
{ {
addUsers(cache::getMembers(room_id_.toStdString(), rowCount())); auto members = cache::getMembers(room_id_.toStdString(), rowCount());
addUsers(members);
numUsersLoaded_ = members.size();
emit numUsersLoadedChanged();
} }

4
src/MemberList.h
View file

@ -15,6 +15,7 @@ class MemberList : public QAbstractListModel
Q_PROPERTY(size_t memberCount READ memberCount NOTIFY memberCountChanged) Q_PROPERTY(size_t memberCount READ memberCount NOTIFY memberCountChanged)
Q_PROPERTY(QString avatarUrl READ avatarUrl NOTIFY avatarUrlChanged) Q_PROPERTY(QString avatarUrl READ avatarUrl NOTIFY avatarUrlChanged)
Q_PROPERTY(QString roomId READ roomId NOTIFY roomIdChanged) Q_PROPERTY(QString roomId READ roomId NOTIFY roomIdChanged)
Q_PROPERTY(int numUsersLoaded READ numUsersLoaded NOTIFY numUsersLoadedChanged)
public: public:
enum Roles enum Roles
@ -37,12 +38,14 @@ public:
size_t memberCount() const { return info_.member_count; } size_t memberCount() const { return info_.member_count; }
QString avatarUrl() const { return QString::fromStdString(info_.avatar_url); } QString avatarUrl() const { return QString::fromStdString(info_.avatar_url); }
QString roomId() const { return room_id_; } QString roomId() const { return room_id_; }
int numUsersLoaded() const { return numUsersLoaded_; }
signals: signals:
void roomNameChanged(); void roomNameChanged();
void memberCountChanged(); void memberCountChanged();
void avatarUrlChanged(); void avatarUrlChanged();
void roomIdChanged(); void roomIdChanged();
void numUsersLoadedChanged();
public slots: public slots:
void addUsers(const std::vector<RoomMember> &users); void addUsers(const std::vector<RoomMember> &users);
@ -55,4 +58,5 @@ private:
QVector<QPair<RoomMember, QString>> m_memberList; QVector<QPair<RoomMember, QString>> m_memberList;
QString room_id_; QString room_id_;
RoomInfo info_; RoomInfo info_;
int numUsersLoaded_;
}; };