ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix freeze when opening already opened room

Browse Source
This commit is contained in:
Tobias Fella
2020-11-19 12:47:43 +01:00
parent f4f0211383
commit d5379f86c1
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
imports/NeoChat/Page/RoomPage.qml
View File

@@ -124,6 +124,8 @@ Kirigami.ScrollablePage {
const index = eventToIndex(currentRoom.readMarkerEventId) const index = eventToIndex(currentRoom.readMarkerEventId)
if(index === -1) if(index === -1)
return return
if(firstVisibleIndex() === -1 || lastVisibleIndex() === -1)
return
if(index < firstVisibleIndex() && index > lastVisibleIndex()) { if(index < firstVisibleIndex() && index > lastVisibleIndex()) {
currentRoom.readMarkerEventId = sortedMessageEventModel.data(sortedMessageEventModel.index(lastVisibleIndex(), 0), MessageEventModel.EventIdRole) currentRoom.readMarkerEventId = sortedMessageEventModel.data(sortedMessageEventModel.index(lastVisibleIndex(), 0), MessageEventModel.EventIdRole)
} }
@@ -395,25 +397,13 @@ Kirigami.ScrollablePage {
} }
function firstVisibleIndex() { function firstVisibleIndex() {
let index = -1;
let center = messageListView.x + messageListView.width / 2; let center = messageListView.x + messageListView.width / 2;
let i = 0; return messageListView.indexAt(center, messageListView.y + messageListView.contentY);
while(index === -1) {
index = messageListView.indexAt(center, messageListView.y + messageListView.contentY + i);
i++;
}
return index;
} }
function lastVisibleIndex() { function lastVisibleIndex() {
let index = -1;
let center = messageListView.x + messageListView.width / 2; let center = messageListView.x + messageListView.width / 2;
let i = 0; return messageListView.indexAt(center, messageListView.y + messageListView.contentY + messageListView.height);
while(index === -1) {
index = messageListView.indexAt(center, messageListView.y + messageListView.contentY + messageListView.height - i);
i++;
}
return index;
} }
function openMessageContext(author, message, eventId, toolTip, model) { function openMessageContext(author, message, eventId, toolTip, model) {