From b79b03218415c3ee66009963fc887253d7c4d0eb Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Fri, 21 Aug 2020 09:27:01 -0400
Subject: [PATCH] Better delegate for completable users

---
 .../CompletableUserDelegate.qml               | 49 +++++++++++++++++++
 .../AutoCompletion/UserAutoCompletion.qml     |  9 +++-
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml

diff --git a/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml b/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
new file mode 100644
index 00000000..9e308d65
--- /dev/null
+++ b/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import "../../../Base"
+import "../../../Base/HTile"
+
+HTile {
+    id: root
+
+    property bool colorName: hovered
+
+    backgroundColor: "transparent"
+    contentItem: ContentRow {
+        tile: root
+
+        HUserAvatar {
+            id: avatar
+            userId: model.id
+            displayName: model.display_name
+            mxc: model.avatar_url
+            compact: root.compact
+
+            implicitHeight:
+                compact ?
+                theme.controls.avatar.compactSize :
+                24 // XXX
+        }
+
+        TitleLabel {
+            textFormat: TitleLabel.StyledText
+            text:
+                (model.display_name || model.id) + (
+                    model.display_name ?
+                    "&nbsp;".repeat(2) + utils.htmlColorize(
+                        model.id, theme.chat.roomPane.listView.member.subtitle,
+                    ) :
+                    ""
+                )
+
+            color:
+                root.colorName ?
+                utils.nameColor(model.display_name || model.id.substring(1)) :
+                theme.chat.roomPane.listView.member.name
+
+            Behavior on color { HColorAnimation {} }
+        }
+    }
+}
diff --git a/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml b/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
index 67265ccc..87625e8b 100644
--- a/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
+++ b/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
@@ -93,9 +93,8 @@ HListView {
     implicitHeight: open && count ? Math.min(window.height, contentHeight) : 0
     model: ModelStore.get(chat.userId, chat.roomId, "autocompleted_members")
 
-    delegate: HTile {
+    delegate: CompletableUserDelegate {
         width: root.width
-        contentItem: HLabel { text: model.display_name + " (" + model.id + ")"}
         onClicked: {
             currentIndex = model.index
             root.open    = false
@@ -126,6 +125,12 @@ HListView {
     Behavior on opacity { HNumberAnimation {} }
     Behavior on implicitHeight { HNumberAnimation {} }
 
+    Rectangle {
+        anchors.fill: parent
+        z: -1
+        color: theme.chat.typingMembers.background
+    }
+
     Connections {
         target: root.textArea