From 20966806d26c0be5cc5cc6aa5642f69496137dd1 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Mon, 23 Nov 2020 19:58:07 +0100
Subject: [PATCH] Simplify reaction delegate

---
 .../Component/Timeline/ReactionDelegate.qml   | 54 +++++++------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
index 784bd61da..ac90139a1 100644
--- a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
@@ -17,52 +17,38 @@ Flow {
     Repeater {
         model: reaction
 
-        delegate: Control {
-            width: Math.max(implicitWidth, Kirigami.Units.largeSpacing * 3)
-            height: Kirigami.Units.largeSpacing * 3
+        delegate: RoundButton {
+            width: Math.min(implicitWidth, Kirigami.Units.largeSpacing * 4)
+            implicitHeight: Kirigami.Units.largeSpacing * 4
 
             horizontalPadding: 6
             verticalPadding: 0
 
-            contentItem: Label {
-                height: Kirigami.Units.largeSpacing * 3
-                text: modelData.reaction + (modelData.count > 1 ? " " + modelData.count : "")
-                elide: Text.ElideRight
-            }
+            text: modelData.reaction + (modelData.count > 1 ? " " + modelData.count : "")
 
-            background: Rectangle {
-                radius: height / 2
-                Kirigami.Theme.colorSet: Kirigami.Theme.Window
-                color: Kirigami.Theme.backgroundColor
+            checkable: true
 
-                MouseArea {
-                    anchors.fill: parent
+            checked: modelData.hasLocalUser
 
-                    hoverEnabled: true
+            onToggled: currentRoom.toggleReaction(eventId, modelData.reaction)
 
-                    ToolTip {
-                        visible: parent.containsMouse
-                        text: {
-                            var text = "";
+            ToolTip.visible: hovered
+            ToolTip.text: {
+                var text = "";
 
-                            for (var i = 0; i < modelData.authors.length; i++) {
-                                if (i === modelData.authors.length - 1 && i !== 0) {
-                                    text += i18nc("Seperate the usernames of users", " and ")
-                                } else if (i !== 0) {
-                                    text += ", "
-                                }
-
-                                text += modelData.authors[i].displayName
-                            }
-
-                            text = i18ncp("%1 is the users who reacted and %2 the emoji that was given", "%2 reacted with %3", "%2 reacted with %3", modelData.authors.length, text, modelData.reaction)
-
-                            return text
-                        }
+                for (var i = 0; i < modelData.authors.length; i++) {
+                    if (i === modelData.authors.length - 1 && i !== 0) {
+                        text += i18nc("Seperate the usernames of users", " and ")
+                    } else if (i !== 0) {
+                        text += ", "
                     }
 
-                    onClicked: currentRoom.toggleReaction(eventId, modelData.reaction)
+                    text += modelData.authors[i].displayName
                 }
+
+                text = i18ncp("%1 is the users who reacted and %2 the emoji that was given", "%2 reacted with %3", "%2 reacted with %3", modelData.authors.length, text, modelData.reaction)
+
+                return text
             }
         }
     }