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

Don't switch room that read receipt-related stuff is opened in

Browse source
This commit is contained in:
Loren Burkholder 2021-07-29 21:29:09 -04:00
parent 368e13fac3
commit 135622e14e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/ReadReceipts.qml
View file

@ -11,6 +11,7 @@ ApplicationWindow {
id: readReceiptsRoot id: readReceiptsRoot
property ReadReceiptsProxy readReceipts property ReadReceiptsProxy readReceipts
property Room room
x: MainWindow.x + (MainWindow.width / 2) - (width / 2) x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
y: MainWindow.y + (MainWindow.height / 2) - (height / 2) y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
@ -65,7 +66,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: room.openUserProfile(model.mxid)
ToolTip.visible: avatarHover.hovered ToolTip.visible: avatarHover.hovered
ToolTip.text: model.mxid ToolTip.text: model.mxid
@ -86,7 +87,7 @@ ApplicationWindow {
ToolTip.text: model.mxid ToolTip.text: model.mxid
TapHandler { TapHandler {
onSingleTapped: Rooms.currentRoom.openUserProfile(userId) onSingleTapped: room.openUserProfile(userId)
} }
CursorShape { CursorShape {

5
resources/qml/Root.qml
View file

@ -173,9 +173,10 @@ Page {
} }
Connections { Connections {
function onOpenReadReceiptsDialog() { function onOpenReadReceiptsDialog(rr) {
var dialog = readReceiptsDialog.createObject(timelineRoot, { var dialog = readReceiptsDialog.createObject(timelineRoot, {
"readReceipts": rr "readReceipts": rr,
"room": Rooms.currentRoom
}); });
dialog.show(); dialog.show();
} }