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

Merge pull request #678 from LorenDB/closeRoom 

Close currently open room when it is tapped again
This commit is contained in:
Joseph Donofry 2021-08-11 18:13:38 -04:00 committed by GitHub
parent 58039f7f3e 9a0c1c27ed
commit 21b2db6745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/RoomList.qml
View File

@ -33,8 +33,8 @@ Page {
Connections { Connections {
function onCurrentRoomChanged() { function onCurrentRoomChanged() {
roomlist.positionViewAtIndex(Rooms.roomidToIndex(Rooms.currentRoom.roomId), ListView.Contain); if (Rooms.currentRoom)
console.log("Test" + Rooms.currentRoom.roomId + " " + Rooms.roomidToIndex(Rooms.currentRoom.roomId)); roomlist.positionViewAtIndex(Rooms.roomidToIndex(Rooms.currentRoom.roomId), ListView.Contain);
} }
target: Rooms target: Rooms
@ -190,7 +190,12 @@ Page {
TapHandler { TapHandler {
margin: -Nheko.paddingSmall margin: -Nheko.paddingSmall
onSingleTapped: Rooms.setCurrentRoom(roomId) onSingleTapped: {
if (!Rooms.currentRoom || Rooms.currentRoom.roomId !== roomId)
Rooms.setCurrentRoom(roomId);
else
Rooms.resetCurrentRoom();
}
onLongPressed: { onLongPressed: {
if (!isInvite) if (!isInvite)
roomContextMenu.show(roomId, tags); roomContextMenu.show(roomId, tags);

8
resources/qml/TimelineView.qml
View File

@ -85,9 +85,13 @@ Item {
target: timelineView target: timelineView
} }
MessageView { Loader {
active: room || roomPreview
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: msgView.height - typingIndicator.height sourceComponent: MessageView {
implicitHeight: msgView.height - typingIndicator.height
}
} }
Loader { Loader {