status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-23 12:08:53 +00:00
Code Issues Projects Releases Wiki Activity

fix(desktop/chat) show the badge during receiving the mention in inactive section

Browse Source
This commit is contained in:
mprakhov 2023-01-06 11:17:39 +02:00 committed by Mykhailo Prakhov
parent db97fbf3eb
commit 0cc64774af
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/modules/main/chat_section/module.nim
View File

@ -286,8 +286,11 @@ method load*(
# we do this only in case of chat section (not in case of communities) # we do this only in case of chat section (not in case of communities)
self.initContactRequestsModel() self.initContactRequestsModel()
for cModule in self.chatContentModules.values: let activeChatId = self.controller.getActiveChatId()
for chatId, cModule in self.chatContentModules:
cModule.load() cModule.load()
if chatId == activeChatId:
cModule.onMadeActive()
proc checkIfModuleDidLoad(self: Module) = proc checkIfModuleDidLoad(self: Module) =
if self.moduleLoaded: if self.moduleLoaded:
@ -357,15 +360,15 @@ method activeItemSubItemSet*(self: Module, itemId: string, subItemId: string) =
self.view.chatsModel().setActiveItemSubItem(itemId, subItemId) self.view.chatsModel().setActiveItemSubItem(itemId, subItemId)
self.view.activeItemSubItemSet(item, subItem) self.view.activeItemSubItemSet(item, subItem)
# update child modules let activeChatId = self.controller.getActiveChatId()
# # update child modules
for chatId, chatContentModule in self.chatContentModules: for chatId, chatContentModule in self.chatContentModules:
if chatId == self.controller.getActiveChatId(): if chatId == activeChatId:
chatContentModule.onMadeActive() chatContentModule.onMadeActive()
else: else:
chatContentModule.onMadeInactive() chatContentModule.onMadeInactive()
let activeChatId = self.controller.getActiveChatId()
# save last open chat in settings for restore on the next app launch # save last open chat in settings for restore on the next app launch
singletonInstance.localAccountSensitiveSettings.setSectionLastOpenChat(mySectionId, activeChatId) singletonInstance.localAccountSensitiveSettings.setSectionLastOpenChat(mySectionId, activeChatId)

17
ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View File

@ -54,7 +54,7 @@ Item {
readonly property var chatDetails: chatContentModule.chatDetails || null readonly property var chatDetails: chatContentModule.chatDetails || null
function markAllMessagesReadIfMostRecentMessageIsInViewport() { function markAllMessagesReadIfMostRecentMessageIsInViewport() {
if (!isMostRecentMessageInViewport) { if (!isMostRecentMessageInViewport || !chatLogView.visible) {
return return
} }
@ -95,8 +95,17 @@ Item {
} }
function onHasUnreadMessagesChanged() { function onHasUnreadMessagesChanged() {
if (d.chatDetails.hasUnreadMessages && d.chatDetails.active && !d.isMostRecentMessageInViewport) { if (!d.chatDetails.hasUnreadMessages) {
// HACK: we call it later because messages model may not be yet propagated with unread messages when this signal is emitted return
}
// HACK: we call `addNewMessagesMarker` later because messages model
// may not be yet propagated with unread messages when this signal is emitted
if (chatLogView.visible) {
if (!d.isMostRecentMessageInViewport) {
Qt.callLater(() => messageStore.addNewMessagesMarker())
}
} else {
Qt.callLater(() => messageStore.addNewMessagesMarker()) Qt.callLater(() => messageStore.addNewMessagesMarker())
} }
} }
@ -154,6 +163,8 @@ Item {
onCountChanged: d.markAllMessagesReadIfMostRecentMessageIsInViewport() onCountChanged: d.markAllMessagesReadIfMostRecentMessageIsInViewport()
onVisibleChanged: d.markAllMessagesReadIfMostRecentMessageIsInViewport()
ScrollBar.vertical: StatusScrollBar { ScrollBar.vertical: StatusScrollBar {
visible: chatLogView.visibleArea.heightRatio < 1 visible: chatLogView.visibleArea.heightRatio < 1
} }