Merge pull request #285 from Lurkki14/master

Use Rectangle for typing users so it doesn't overlap with the timeline

1 files changed, 17 insertions, 12 deletions

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml

index e4643635..aa4d6846 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -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