status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-10 14:26:34 +00:00
Code Issues Projects Releases Wiki Activity

feat: add New messages box in chat when scrolling up

Browse Source
This commit is contained in:
Jonathan Rainville 2020-07-23 16:22:45 -04:00 committed by Iuri Matias
parent c73da6accf
commit 9604faff08
2 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/chat/view.nim
View File

@ -196,6 +196,7 @@ QtObject:
self.channelOpenTime[channel] = now().toTime.toUnix * 1000
proc messagePushed*(self: ChatsView) {.signal.}
proc newMessagePushed*(self: ChatsView) {.signal.}
proc messageNotificationPushed*(self: ChatsView, chatId: string, text: string) {.signal.}
@ -211,8 +212,11 @@ QtObject:
msg.alias = self.status.chat.getUserName(msg.fromAuthor, msg.alias)
self.messageList[msg.chatId].add(msg)
self.messagePushed()
if msg.chatId != self.activeChannel.id and self.channelOpenTime.getOrDefault(msg.chatId, high(int64)) < msg.timestamp.parseFloat.fromUnixFloat.toUnix:
self.messageNotificationPushed(msg.chatId, msg.text)
if self.channelOpenTime.getOrDefault(msg.chatId, high(int64)) < msg.timestamp.parseFloat.fromUnixFloat.toUnix:
if msg.chatId != self.activeChannel.id:
self.messageNotificationPushed(msg.chatId, msg.text)
else:
self.newMessagePushed()
proc updateUsernames*(self:ChatsView, contacts: seq[Profile]) =
if contacts.len > 0:

67
ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
View File

@ -36,24 +36,79 @@ ScrollView {
id: timer
}
Rectangle {
id: newMessagesBox
color: Style.current.secondaryBackground
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
height: newMessagesText.height + clickHereText.height + 2 * Style.current.smallPadding
width: 200
radius: Style.current.radius
StyledText {
id: newMessagesText
text: qsTr("New message(s) received")
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
anchors.left: parent.left
anchors.leftMargin: Style.current.smallPadding
anchors.right: parent.right
anchors.rightMargin: Style.current.smallPadding
anchors.top: parent.top
anchors.topMargin: Style.current.smallPadding
font.pixelSize: 15
}
StyledText {
id: clickHereText
text: qsTr("Click here to scroll back down")
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
anchors.left: parent.left
anchors.leftMargin: Style.current.smallPadding
anchors.right: parent.right
anchors.rightMargin: Style.current.smallPadding
anchors.top: newMessagesText.bottom
anchors.topMargin: 0
font.pixelSize: 12
color: Style.current.darkGrey
}
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
newMessagesBox.visible = false
chatLogView.scrollToBottom(true)
}
}
}
onAtYEndChanged: {
if (chatLogView.atYEnd) {
newMessagesBox.visible = false
}
}
function scrollToBottom(force, caller) {
if (!force && !chatLogView.atYEnd) {
// User has scrolled up, we don't want to scroll back
return
return false
}
if (caller) {
if (caller !== chatLogView.itemAtIndex(chatLogView.count - 1)) {
// If we have a caller, only accept its request if it's the last message
return
return false
}
// Add a small delay because images, even though they say they say they are loaed, they aren't shown yet
timer.setTimeout(function() {
Qt.callLater(chatLogView.positionViewAtEnd)
}, 100);
return
return true
}
Qt.callLater(chatLogView.positionViewAtEnd)
return true
}
@ -72,8 +127,10 @@ ScrollView {
chatLogView.scrollToBottom(true)
}
onMessagePushed: {
chatLogView.scrollToBottom()
onNewMessagePushed: {
if (!chatLogView.scrollToBottom()) {
newMessagesBox.visible = true
}
}
onAppReady: {