sprainbrains/harbour-fernschreiber
1
0
Fork 0
forked from medvedych/harbour-fernschreiber
Code Pull requests Activity

Fixed MessageSticker highlight and click behavior

Browse source 
The highlighted property has been moved to MessageContentBase and
the mouse area was stealing mouse events from the parent.
This commit is contained in:
Slava Monich 2021-02-21 01:39:25 +02:00
parent 6ebe312651
commit 3497f9d0fc
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
qml/components/messageContent/MessageSticker.qml
View file

@ -22,12 +22,14 @@ import WerkWolf.Fernschreiber 1.0
import "../"
MessageContentBase {
id: thisItem
readonly property var stickerData: messageListItem ? messageListItem.myMessage.content.sticker : overlayFlickable.overlayMessage.content.sticker;
readonly property bool animated: stickerData.is_animated && appSettings.animateStickers
readonly property bool stickerVisible: staticStickerLoader.item ? staticStickerLoader.item.visible :
animatedStickerLoader.item ? animatedStickerLoader.item.visible : false
readonly property bool isOwnSticker : messageListItem ? messageListItem.isOwnMessage : overlayFlickable.isOwnMessage
property real aspectRatio: stickerData.width / stickerData.height
readonly property real aspectRatio: stickerData.width / stickerData.height
implicitWidth: stickerData.width
implicitHeight: stickerData.height
@ -59,7 +61,7 @@ MessageContentBase {
asynchronous: true
paused: !Qt.application.active
cache: false
layer.enabled: highlighted
layer.enabled: thisItem.highlighted
layer.effect: PressEffect { source: animatedSticker }
}
}
@ -80,7 +82,7 @@ MessageContentBase {
visible: opacity > 0
opacity: status === Image.Ready ? 1 : 0
Behavior on opacity { FadeAnimation {} }
layer.enabled: highlighted
layer.enabled: thisItem.highlighted
layer.effect: PressEffect { source: staticSticker }
}
}
@ -96,14 +98,11 @@ MessageContentBase {
opacity: !stickerVisible && !placeHolderDelayTimer.running ? 0.15 : 0
Behavior on opacity { FadeAnimation {} }
}
}
MouseArea {
anchors.fill: parent
onClicked: {
stickerSetOverlayLoader.stickerSetId = stickerData.set_id;
stickerSetOverlayLoader.active = true;
}
}
onClicked: {
stickerSetOverlayLoader.stickerSetId = stickerData.set_id
stickerSetOverlayLoader.active = true
}
Timer {