From 8a55db4eb8caf241392184d4b19907d8e72ed2e4 Mon Sep 17 00:00:00 2001
From: Noah Davis <noahadvs@gmail.com>
Date: Thu, 27 May 2021 14:07:57 -0400
Subject: [PATCH] Move TypingIndicator to the right side

So that it's less likely to cover message text.
---
 imports/NeoChat/Component/TypingPane.qml | 7 +++----
 imports/NeoChat/Page/RoomPage.qml        | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/imports/NeoChat/Component/TypingPane.qml b/imports/NeoChat/Component/TypingPane.qml
index 8d23f5b75..548b8613d 100644
--- a/imports/NeoChat/Component/TypingPane.qml
+++ b/imports/NeoChat/Component/TypingPane.qml
@@ -18,7 +18,6 @@ Loader {
     sourceComponent: Pane {
         id: typingPane
 
-        clip: true
         leftPadding: Kirigami.Units.largeSpacing
         rightPadding: Kirigami.Units.largeSpacing
         topPadding: Kirigami.Units.smallSpacing
@@ -94,9 +93,9 @@ Loader {
             }
         }
 
-        leftInset: mirrored ? 0 : -3
-        rightInset: mirrored ? -3 : 0
-        bottomInset: -3
+        leftInset: !mirrored ? 0 : -background.radius
+        rightInset: mirrored ? 0 : -background.radius
+        bottomInset: -background.radius
         background: Rectangle {
             radius: 3
             color: Kirigami.Theme.backgroundColor
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 76122f05a..94e5825b4 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -637,7 +637,7 @@ Kirigami.ScrollablePage {
         QQC2.RoundButton {
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: Kirigami.Units.largeSpacing
+            anchors.bottomMargin: Kirigami.Units.largeSpacing + messageListView.headerItem.height
             anchors.rightMargin: Kirigami.Units.largeSpacing
             implicitWidth: Kirigami.Units.gridUnit * 2
             implicitHeight: Kirigami.Units.gridUnit * 2
@@ -725,7 +725,7 @@ Kirigami.ScrollablePage {
                 currentRoom.usersTyping.length,
                 currentRoom.usersTyping.map(user => user.displayName).join(", ")
             ) : ""
-            anchors.left: parent.left
+            anchors.right: parent.right
             height: visible ? implicitHeight : 0
             Behavior on height {
                 NumberAnimation {