diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-08-30 19:32:21 +0200 |
|---|---|---|
| committer | CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> | 2020-09-03 09:37:02 +0530 |
| commit | e0981e17a1887f3e3068b35ce096474735bc733c (patch) | |
| tree | ca1d56954c7424a870ed3a80c1f3f1a487d9417e /resources | |
| parent | fix (diff) | |
| download | nheko-e0981e17a1887f3e3068b35ce096474735bc733c.tar.xz | |
Fix reactions
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/Reactions.qml | 5 | ||||
| -rw-r--r-- | resources/qml/TimelineRow.qml | 1 | ||||
| -rw-r--r-- | resources/qml/emoji/EmojiPicker.qml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index 9fc30f61..ec46f7e0 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -14,7 +14,6 @@ Flow { property real highlightLight: colors.highlight.hslLightness property string eventId - property string roomId anchors.left: parent.left anchors.right: parent.right @@ -35,7 +34,7 @@ Flow { ToolTip.text: modelData.users onClicked: { - console.debug("Picked " + modelData.key + "in response to " + reactionFlow.eventId + " in room " + reactionFlow.roomId + ". selfReactedEvent: " + modelData.selfReactedEvent) + console.debug("Picked " + modelData.key + "in response to " + reactionFlow.eventId + ". selfReactedEvent: " + modelData.selfReactedEvent) TimelineManager.queueReactionMessage(reactionFlow.eventId, modelData.key) } @@ -57,7 +56,7 @@ Flow { Text { anchors.baseline: reactionCounter.baseline id: reactionText - text: textMetrics.elidedText + (textMetrics.elidedText == model.key ? "" : "…") + text: textMetrics.elidedText + (textMetrics.elidedText == modelData.key ? "" : "…") font.family: Settings.emojiFont color: reaction.hovered ? colors.highlight : colors.text maximumLineCount: 1 diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index 2979908e..c026d828 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -64,7 +64,6 @@ Item { Reactions { id: reactionRow reactions: model.reactions - roomId: model.roomId eventId: model.id } } diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index d2ca4da3..cbb77beb 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -104,7 +104,7 @@ Popup { onClicked: { console.debug("Picked " + model.unicode + "in response to " + emojiPopup.event_id) emojiPopup.close() - TimelineManager.queueReactionMessage(emojiPopup.room_id, emojiPopup.event_id, model.unicode) + TimelineManager.queueReactionMessage(emojiPopup.event_id, model.unicode) } } |