1 files changed, 50 insertions, 5 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 206b9a17..d0ec3214 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -106,21 +106,66 @@ Item {
Repeater {
model: Settings.recentReactions
+ visible: room ? room.permissions.canSend(MtxEvent.Reaction) : false
+
+ delegate: AbstractButton {
+ id: button
- delegate: TextButton {
required property string modelData
- visible: room ? room.permissions.canSend(MtxEvent.Reaction) : false
+ property color highlightColor: Nheko.colors.highlight
+ property color buttonTextColor: Nheko.colors.buttonText
+ property bool showImage: modelData.startsWith("mxc://")
+
+ //Layout.preferredHeight: fontMetrics.height
+ Layout.alignment: Qt.AlignBottom
+
+ focusPolicy: Qt.NoFocus
+ width: showImage ? 16 : buttonText.implicitWidth
+ height: showImage ? 16 : buttonText.implicitHeight
+ implicitWidth: showImage ? 16 : buttonText.implicitWidth
+ implicitHeight: showImage ? 16 : buttonText.implicitHeight
+
+ Label {
+ id: buttonText
- Layout.preferredHeight: fontMetrics.height
- font.family: Settings.emojiFont
+ visible: !button.showImage
+
+ anchors.centerIn: parent
+ padding: 0
+ text: button.modelData
+ color: button.hovered ? button.highlightColor : button.buttonTextColor
+ font.family: Settings.emojiFont
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+ }
+
+ Image {
+ id: buttonImg
+
+ // Workaround, can't get icon.source working for now...
+ anchors.fill: parent
+ source: button.showImage ? (button.modelData.replace("mxc://", "image://MxcImage/") + "?scale") : ""
+ sourceSize.height: button.height
+ sourceSize.width: button.width
+ fillMode: Image.PreserveAspectFit
+ }
+
+ CursorShape {
+ anchors.fill: parent
+ cursorShape: Qt.PointingHandCursor
+ }
+
+ Ripple {
+ color: Qt.rgba(buttonTextColor.r, buttonTextColor.g, buttonTextColor.b, 0.5)
+ }
- text: modelData
onClicked: {
room.input.reaction(row.model.eventId, modelData);
TimelineManager.focusMessageInput();
}
}
+
}
ImageButton {
|
