From 854aa34e52df5add544dfb59357b8e04a637f4b2 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 14 Apr 2025 17:04:12 +0200 Subject: [PATCH] Don't offer stickers for reactions --- src/chatbar/EmojiDialog.qml | 2 ++ src/chatbar/EmojiPicker.qml | 2 ++ src/qml/HoverActions.qml | 1 + src/timeline/ReactionComponent.qml | 1 + 4 files changed, 6 insertions(+) diff --git a/src/chatbar/EmojiDialog.qml b/src/chatbar/EmojiDialog.qml index 15fae795b..f5b904035 100644 --- a/src/chatbar/EmojiDialog.qml +++ b/src/chatbar/EmojiDialog.qml @@ -19,6 +19,7 @@ QQC2.Popup { property bool includeCustom: false property bool closeOnChosen: true property bool showQuickReaction: false + property bool showStickers: true signal chosen(string emoji) @@ -71,6 +72,7 @@ QQC2.Popup { currentRoom: root.currentRoom includeCustom: root.includeCustom showQuickReaction: root.showQuickReaction + showStickers: root.showStickers onChosen: emoji => { root.chosen(emoji); if (root.closeOnChosen) { diff --git a/src/chatbar/EmojiPicker.qml b/src/chatbar/EmojiPicker.qml index 7e4adab29..1db01266a 100644 --- a/src/chatbar/EmojiPicker.qml +++ b/src/chatbar/EmojiPicker.qml @@ -17,6 +17,7 @@ ColumnLayout { property bool includeCustom: false property bool showQuickReaction: false + property bool showStickers: true readonly property var currentEmojiModel: { if (includeCustom) { @@ -43,6 +44,7 @@ ColumnLayout { id: types Layout.fillWidth: true Kirigami.Theme.colorSet: Kirigami.Theme.View + visible: root.showStickers background: null actions: [ diff --git a/src/qml/HoverActions.qml b/src/qml/HoverActions.qml index 5345adfa3..d1a9b8439 100644 --- a/src/qml/HoverActions.qml +++ b/src/qml/HoverActions.qml @@ -169,6 +169,7 @@ QQC2.Control { id: emojiDialog currentRoom: root.currentRoom showQuickReaction: true + showStickers: false onChosen: emoji => { root.currentRoom.toggleReaction(root.delegate.eventId, emoji); if (!Kirigami.Settings.isMobile) { diff --git a/src/timeline/ReactionComponent.qml b/src/timeline/ReactionComponent.qml index 3df7c350c..2b42efa53 100644 --- a/src/timeline/ReactionComponent.qml +++ b/src/timeline/ReactionComponent.qml @@ -105,6 +105,7 @@ Flow { onClicked: { var dialog = emojiDialog.createObject(reactButton); + dialog.showStickers = false; dialog.chosen.connect(emoji => { root.Message.room.toggleReaction(root.eventId, emoji); if (!Kirigami.Settings.isMobile) {