Merge pull request #285 from Lurkki14/master

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

View file

@ -434,18 +434,23 @@ Page {
id: footerContent
anchors.left: parent.left
anchors.right: parent.right
Label {
id: typingDisplay
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 10
anchors.rightMargin: 10
color: colors.text
text: chat.model ? chat.model.formatTypingUsers(chat.model.typingUsers, colors.window) : ""
textFormat: Text.RichText
}
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 {
id: typingDisplay
anchors.left: parent.left
anchors.leftMargin: 10
anchors.right: parent.right
anchors.rightMargin: 10
color: colors.text
text: chat.model ? chat.model.formatTypingUsers(chat.model.typingUsers, colors.window) : ""
textFormat: Text.RichText
}
}
Rectangle {
anchors.left: parent.left