From 3497f9d0fcba1ed4a9f569b687ca8095c9293c69 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava@monich.com>
Date: Sun, 21 Feb 2021 01:39:25 +0200
Subject: [PATCH] Fixed MessageSticker highlight and click behavior

The highlighted property has been moved to MessageContentBase and
the mouse area was stealing mouse events from the parent.
---
 .../messageContent/MessageSticker.qml         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/qml/components/messageContent/MessageSticker.qml b/qml/components/messageContent/MessageSticker.qml
index 5216e57..77fbe4d 100644
--- a/qml/components/messageContent/MessageSticker.qml
+++ b/qml/components/messageContent/MessageSticker.qml
@@ -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 {