Strip variant selector in some cases

fixes #439
Workaround for https://bugreports.qt.io/browse/QTBUG-97401
fixes #810

2 files changed, 4 insertions, 3 deletions

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

index 076e6b64..63115ec0 100644
--- a/resources/qml/Reactions.qml
+++ b/resources/qml/Reactions.qml
@@ -34,6 +34,7 @@ Flow {
             implicitHeight: contentItem.childrenRect.height
             ToolTip.visible: hovered
             ToolTip.text: modelData.users
+            ToolTip.delay: Nheko.tooltipDelay
             onClicked: {
                 console.debug("Picked " + modelData.key + "in response to " + reactionFlow.eventId + ". selfReactedEvent: " + modelData.selfReactedEvent);
                 room.input.reaction(reactionFlow.eventId, modelData.key);
@@ -51,14 +52,14 @@ Flow {
                     font.family: Settings.emojiFont
                     elide: Text.ElideRight
                     elideWidth: 150
-                    text: modelData.key
+                    text: modelData.displayKey
                 }
 
                 Text {
                     id: reactionText
 
                     anchors.baseline: reactionCounter.baseline
-                    text: textMetrics.elidedText + (textMetrics.elidedText == modelData.key ? "" : "…")
+                    text: textMetrics.elidedText + (textMetrics.elidedText == modelData.displayKey ? "" : "…")
                     font.family: Settings.emojiFont
                     color: reaction.hovered ? Nheko.colors.highlight : Nheko.colors.text
                     maximumLineCount: 1
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml

index fd8c0720..96ed1b0e 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -166,7 +166,7 @@ Menu {
                         verticalAlignment: Text.AlignVCenter
                         font.family: Settings.emojiFont
                         font.pixelSize: 36
-                        text: model.unicode
+                        text: model.unicode.replace('\ufe0f', '')
                         color: Nheko.colors.text
                     }