From dd74bdc697fb0fe41c5b14694dec9cc028353d23 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 25 May 2023 19:20:25 +0200 Subject: Get rid of old emoji picker --- resources/qml/MessageView.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'resources/qml/MessageView.qml') diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index c75710cf..cc80cbbf 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -149,9 +149,9 @@ Item { ToolTip.visible: hovered ToolTip.delay: Nheko.tooltipDelay ToolTip.text: qsTr("React") - onClicked: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(reactButton, function(emoji) { + onClicked: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(reactButton, room.roomId, function(plaintext, markdown) { var event_id = row.model ? row.model.eventId : ""; - room.input.reaction(event_id, emoji); + room.input.reaction(event_id, plaintext); TimelineManager.focusMessageInput(); }) } @@ -666,8 +666,9 @@ Item { visible: room ? room.permissions.canSend(MtxEvent.Reaction) : false text: qsTr("Re&act") - onTriggered: emojiPopup.show(null, function(emoji) { - room.input.reaction(messageContextMenu.eventId, emoji); + onTriggered: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(null, room.roomId, function(plaintext, markdown) { + room.input.reaction(messageContextMenu.eventId, plaintext); + TimelineManager.focusMessageInput(); }) } -- cgit 1.5.1