medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Show stickers as stickers when showStickersAsImages is off

Browse source
This commit is contained in:
Slava Monich 2020-10-09 18:58:18 +03:00
parent 4e65375234
commit f4c84daebf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qml/pages/ChatPage.qml
View file

@ -497,7 +497,6 @@ Page {
onTriggered: { onTriggered: {
webPagePreviewLoader.active = ( typeof display.content.web_page !== "undefined" ); webPagePreviewLoader.active = ( typeof display.content.web_page !== "undefined" );
imagePreviewLoader.active = ( display.content['@type'] === "messagePhoto" ); imagePreviewLoader.active = ( display.content['@type'] === "messagePhoto" );
stickerPreviewLoader.active = ( display.content['@type'] === "messageSticker" );
videoPreviewLoader.active = (( display.content['@type'] === "messageVideo" ) || ( display.content['@type'] === "messageAnimation" )); videoPreviewLoader.active = (( display.content['@type'] === "messageVideo" ) || ( display.content['@type'] === "messageAnimation" ));
audioPreviewLoader.active = (( display.content['@type'] === "messageVoiceNote" ) || ( display.content['@type'] === "messageAudio" )); audioPreviewLoader.active = (( display.content['@type'] === "messageVoiceNote" ) || ( display.content['@type'] === "messageAudio" ));
documentPreviewLoader.active = ( display.content['@type'] === "messageDocument" ); documentPreviewLoader.active = ( display.content['@type'] === "messageDocument" );
@ -560,6 +559,7 @@ Page {
color: index > ( chatView.count - chatInformation.unread_count - 1 ) ? Theme.secondaryHighlightColor : Theme.secondaryColor color: index > ( chatView.count - chatInformation.unread_count - 1 ) ? Theme.secondaryHighlightColor : Theme.secondaryColor
radius: parent.width / 50 radius: parent.width / 50
opacity: index > ( chatView.count - chatInformation.unread_count - 1 ) ? 0.5 : 0.2 opacity: index > ( chatView.count - chatInformation.unread_count - 1 ) ? 0.5 : 0.2
visible: appSettings.showStickersAsImages || display.content['@type'] !== "messageSticker"
} }
Column { Column {
@ -740,18 +740,16 @@ Page {
Component { Component {
id: stickerPreviewComponent id: stickerPreviewComponent
StickerPreview { StickerPreview {
id: messageStickerPreview
stickerData: ( display.content['@type'] === "messageSticker" ) ? display.content.sticker : "" stickerData: ( display.content['@type'] === "messageSticker" ) ? display.content.sticker : ""
visible: display.content['@type'] === "messageSticker"
anchors.horizontalCenter: parent.horizontalCenter
} }
} }
Loader { Loader {
id: stickerPreviewLoader id: stickerPreviewLoader
active: false active: display.content['@type'] === "messageSticker"
asynchronous: true asynchronous: true
width: parent.width x: (chatPage.myUserId === display.sender_user_id) ? (parent.width - width) : 0
width: (appSettings.showStickersAsImages || !item) ? parent.width : item.width
sourceComponent: stickerPreviewComponent sourceComponent: stickerPreviewComponent
} }