rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #651 from LorenDB/qml-all-the-things 

Fix a few UI things
This commit is contained in:
DeepBlueV7.X 2021-07-23 16:17:43 +00:00 committed by GitHub
parent e5fec03d27 0ce7d02abe
commit ca3d17dc22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/InviteDialog.qml
View File

@ -107,7 +107,7 @@ ApplicationWindow {
userid: model.mxid userid: model.mxid
url: model.avatarUrl.replace("mxc://", "image://MxcImage/") url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
displayName: model.displayName displayName: model.displayName
onClicked: Rooms.currentRoom.openUserProfile(model.mxid) onClicked: TimelineManager.openGlobalUserProfile(model.mxid)
} }
ColumnLayout { ColumnLayout {

19
resources/qml/MessageView.qml
View File

@ -477,12 +477,23 @@ ScrollView {
} }
footer: Spinner { footer: Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
running: chat.model && chat.model.paginationInProgress anchors.margins: Nheko.paddingLarge
foreground: Nheko.colors.mid
visible: chat.model && chat.model.paginationInProgress visible: chat.model && chat.model.paginationInProgress
z: 3 // hacky, but works
height: loadingSpinner.height + 2 * Nheko.paddingLarge
Spinner {
id: loadingSpinner
anchors.centerIn: parent
anchors.margins: Nheko.paddingLarge
running: chat.model && chat.model.paginationInProgress
foreground: Nheko.colors.mid
z: 3
}
} }
} }

7
src/timeline/TimelineViewManager.cpp
View File

@ -393,6 +393,13 @@ TimelineViewManager::openInviteUsers(QString roomId)
emit openInviteUsersDialog(model); emit openInviteUsersDialog(model);
} }
void
TimelineViewManager::openGlobalUserProfile(QString userId)
{
UserProfile *profile = new UserProfile{QString{}, userId, this};
emit openProfile(profile);
}
void void
TimelineViewManager::setVideoCallItem() TimelineViewManager::setVideoCallItem()
{ {

1
src/timeline/TimelineViewManager.h
View File

@ -69,6 +69,7 @@ public:
Q_INVOKABLE void openRoomMembers(QString room_id); Q_INVOKABLE void openRoomMembers(QString room_id);
Q_INVOKABLE void openRoomSettings(QString room_id); Q_INVOKABLE void openRoomSettings(QString room_id);
Q_INVOKABLE void openInviteUsers(QString roomId); Q_INVOKABLE void openInviteUsers(QString roomId);
Q_INVOKABLE void openGlobalUserProfile(QString userId);
Q_INVOKABLE void focusMessageInput(); Q_INVOKABLE void focusMessageInput();
Q_INVOKABLE void openLeaveRoomDialog(QString roomid) const; Q_INVOKABLE void openLeaveRoomDialog(QString roomid) const;