From 135622e14e8ff3bba32becce722d986e0abf11f5 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Thu, 29 Jul 2021 21:29:09 -0400 Subject: [PATCH] Don't switch room that read receipt-related stuff is opened in --- resources/qml/ReadReceipts.qml | 5 +++-- resources/qml/Root.qml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/qml/ReadReceipts.qml b/resources/qml/ReadReceipts.qml index 5f213328..db5d2e36 100644 --- a/resources/qml/ReadReceipts.qml +++ b/resources/qml/ReadReceipts.qml @@ -11,6 +11,7 @@ ApplicationWindow { id: readReceiptsRoot property ReadReceiptsProxy readReceipts + property Room room x: MainWindow.x + (MainWindow.width / 2) - (width / 2) y: MainWindow.y + (MainWindow.height / 2) - (height / 2) @@ -65,7 +66,7 @@ ApplicationWindow { userid: model.mxid url: model.avatarUrl.replace("mxc://", "image://MxcImage/") displayName: model.displayName - onClicked: Rooms.currentRoom.openUserProfile(model.mxid) + onClicked: room.openUserProfile(model.mxid) ToolTip.visible: avatarHover.hovered ToolTip.text: model.mxid @@ -86,7 +87,7 @@ ApplicationWindow { ToolTip.text: model.mxid TapHandler { - onSingleTapped: Rooms.currentRoom.openUserProfile(userId) + onSingleTapped: room.openUserProfile(userId) } CursorShape { diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index a099b5e6..a7684af5 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -173,9 +173,10 @@ Page { } Connections { - function onOpenReadReceiptsDialog() { + function onOpenReadReceiptsDialog(rr) { var dialog = readReceiptsDialog.createObject(timelineRoot, { - "readReceipts": rr + "readReceipts": rr, + "room": Rooms.currentRoom }); dialog.show(); }