From dd20df5c2633b5e68544992ade90d461a9b5fab8 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Wed, 17 Mar 2021 21:12:59 -0400
Subject: [PATCH] Fix hover actions being taken away by scrolling

---
 .../Component/Timeline/TimelineContainer.qml  | 39 +++++++++++--------
 imports/NeoChat/Page/RoomPage.qml             | 16 ++++++--
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index b0d9288f2..f0b11c74c 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -46,25 +46,30 @@ Item {
     // show hover actions
     onHoveredChanged: {
         if (hovered && !Kirigami.Settings.isMobile) {
-            hoverComponent.parent = controlContainer;
-            hoverComponent.x = Qt.binding(() => controlContainer.width - hoverComponent.childWidth)
-            hoverComponent.y = -Kirigami.Units.largeSpacing * 4
-            hoverComponent.hovered = Qt.binding(() => controlContainer.hovered);
-            hoverComponent.showEdit = author.id === Controller.activeConnection.localUserId && (model.eventType === "emote" || model.eventType === "message");
-
-            hoverComponent.editClicked = () => {
-                if (hoverComponent.showEdit) {
-                    edit(message, model.formattedBody, eventId);
-                } 
-            };
-            hoverComponent.replyClicked = () => {
-                replyToMessage(author, message, eventId);
-            };
-            hoverComponent.reacted = emoji => {
-                currentRoom.toggleReaction(eventId, emoji);
-            };
+            updateHoverComponent();
         }
     }
+    
+    // updates the global hover component to point to this delegate, and update its position
+    function updateHoverComponent() {
+        hoverComponent.x = column.mapToItem(page, hoverComponentX, hoverComponentY).x;
+        hoverComponent.y = column.mapToItem(page, hoverComponentX, hoverComponentY).y;
+        hoverComponent.hovered = Qt.binding(() => controlContainer.hovered);
+        hoverComponent.showEdit = author.id === Controller.activeConnection.localUserId && (model.eventType === "emote" || model.eventType === "message");
+        hoverComponent.updateFunction = updateHoverComponent;
+        
+        hoverComponent.editClicked = () => {
+            if (hoverComponent.showEdit) {
+                edit(message, model.formattedBody, eventId);
+            } 
+        };
+        hoverComponent.replyClicked = () => {
+            replyToMessage(author, message, eventId);
+        };
+        hoverComponent.reacted = emoji => {
+            currentRoom.toggleReaction(eventId, emoji);
+        };
+    }
 
     DragHandler {
         enabled: Kirigami.Settings.isMobile
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 1b4b0fc09..07193a912 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -129,13 +129,23 @@ Kirigami.ScrollablePage {
     }
 
     // hover actions on a delegate, activated in TimelineContainer.qml
-    QQC2.Popup {
+    Connections {
+        target: page.flickable
+        function onContentYChanged() {
+            if (hoverActions.visible) {
+                hoverActions.updateFunction();
+            }
+        }
+    }
+    Item {
         id: hoverActions
         property bool showEdit
         property bool hovered: false
 
         visible: (hovered || hoverHandler.hovered) && !Kirigami.Settings.isMobile
 
+        property var updateFunction
+
         property var editClicked
         property var replyClicked
         property var reacted
@@ -143,9 +153,7 @@ Kirigami.ScrollablePage {
         property alias childWidth: hoverActionsRow.width
         property alias childHeight: hoverActionsRow.height
 
-        background: Item {}
-
-        contentItem: RowLayout {
+        RowLayout {
             id: hoverActionsRow
             z: 4
             spacing: 0