Merge pull request #285 from Lurkki14/master

Use Rectangle for typing users so it doesn't overlap with the timeline
4 years ago · fe325f9266
parent 6c63762aa4 13658d536e
commit fe325f9266
1 changed files with 17 additions and 12 deletions
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@ -434,17 +434,22 @@ Page {
 				id: footerContent
 				anchors.left: parent.left
 				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 {
                        id: typingDisplay
                        anchors.left: parent.left
-					anchors.right: parent.right
                        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 {