d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-12-01 22:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #285 from Lurkki14/master

Browse source 
Use Rectangle for typing users so it doesn't overlap with the timeline
This commit is contained in:
DeepBlueV7.X 2020-09-19 17:02:53 +02:00 committed by GitHub
commit fe325f9266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/TimelineView.qml
View file

@ -434,17 +434,22 @@ Page {
id: footerContent id: footerContent
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Rectangle {
id: typingRect
anchors.left: parent.left
anchors.right: parent.right
color: (chat.model && chat.model.typingUsers.length > 0) ? colors.window : "transparent"
height: chatFooter.height
Label { Label {
id: typingDisplay id: typingDisplay
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 10 anchors.leftMargin: 10
anchors.right: parent.right
anchors.rightMargin: 10 anchors.rightMargin: 10
color: colors.text color: colors.text
text: chat.model ? chat.model.formatTypingUsers(chat.model.typingUsers, colors.window) : "" text: chat.model ? chat.model.formatTypingUsers(chat.model.typingUsers, colors.window) : ""
textFormat: Text.RichText textFormat: Text.RichText
}
} }
Rectangle { Rectangle {