ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for stickers

Browse Source 
Fix #130
This commit is contained in:
Carl Schwan
2020-12-29 14:28:32 +00:00
parent 9ba0a755e4
commit 5c8d916752
4 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
imports/NeoChat/Component/Timeline/ImageDelegate.qml
View File

@@ -17,6 +17,8 @@ import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0
Image {
id: img
readonly property bool isAnimated: contentType === "image/gif"
property bool openOnFinished: false
@@ -26,8 +28,7 @@ Image {
// readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
readonly property var info: content.info
readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId
id: img
property bool readonly: false
source: "image://mxc/" + mediaId
@@ -36,34 +37,12 @@ Image {
fillMode: Image.PreserveAspectFit
Control {
anchors.bottom: parent.bottom
anchors.bottomMargin: 8
anchors.right: parent.right
anchors.rightMargin: 8
ToolTip.text: display
ToolTip.visible: hoverHandler.hovered
horizontalPadding: 8
verticalPadding: 4
contentItem: RowLayout {
Label {
text: Qt.formatTime(time)
color: "white"
font.pixelSize: 12
}
Label {
text: author.displayName
color: "white"
font.pixelSize: 12
}
}
background: Rectangle {
radius: 2
color: "black"
opacity: 0.3
}
HoverHandler {
id: hoverHandler
enabled: img.readonly
}
Rectangle {
@@ -87,6 +66,8 @@ Image {
MouseArea {
id: messageMouseArea
enabled: !img.readonly
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton

33
imports/NeoChat/Page/RoomPage.qml
View File

@@ -318,7 +318,7 @@ Kirigami.ScrollablePage {
ReactionDelegate {
Layout.fillWidth: true
Layout.topMargin: 0
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
Layout.bottomMargin: Kirigami.Units.largeSpacing
}
]
}
@@ -362,7 +362,35 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
Layout.topMargin: 0
Layout.maximumHeight: 320
Layout.bottomMargin: 8
Layout.bottomMargin: Kirigami.Units.largeSpacing
}
]
}
}
}
DelegateChoice {
roleValue: "sticker"
delegate: TimelineContainer {
width: messageListView.width
innerObject: MessageDelegate {
Layout.fillWidth: true
onReplyClicked: goToEvent(eventID)
onReplyToMessageClicked: replyToMessage(replyUser, replyContent, eventId);
innerObject: [
ImageDelegate {
readonly: true
Layout.maximumWidth: parent.width / 2
Layout.minimumWidth: 320
Layout.preferredHeight: info.h / info.w * width
},
ReactionDelegate {
Layout.fillWidth: true
Layout.topMargin: 0
Layout.maximumHeight: 320
Layout.bottomMargin: Kirigami.Units.largeSpacing
}
]
}
@@ -443,6 +471,7 @@ Kirigami.ScrollablePage {
}
}
DelegateChoice {
roleValue: "other"
delegate: Item {}