From 4d79f8078e4883f268ee12bb5db5873bb694e30d Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 26 Feb 2020 23:43:54 +0100
Subject: [PATCH] Don't let click on reply steal focus from the replied to
 elements

---
 resources/qml/MatrixText.qml      |  3 ++-
 resources/qml/delegates/Reply.qml | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml
index 560a8108..9a4f7348 100644
--- a/resources/qml/MatrixText.qml
+++ b/resources/qml/MatrixText.qml
@@ -22,7 +22,8 @@ TextEdit {
 	{
 		id: ma
 		anchors.fill: parent
-		onPressed:  mouse.accepted = false
+		propagateComposedEvents: true
+		acceptedButtons: Qt.NoButton
 		cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
 	}
 
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index 8bb9ed38..06804328 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -12,6 +12,13 @@ Rectangle {
 	width: parent.width
 	height: replyContainer.height
 
+	MouseArea {
+		anchors.fill: parent
+		preventStealing: true
+		onClicked: chat.positionViewAtIndex(chat.model.idToIndex(timelineManager.replyingEvent), ListView.Contain)
+		cursorShape: Qt.PointingHandCursor
+	}
+
 	Rectangle {
 		id: colorLine
 
@@ -48,10 +55,4 @@ Rectangle {
 	}
 
 	color: Qt.rgba(userColor.r, userColor.g, userColor.b, 0.2)
-
-	MouseArea {
-		anchors.fill: parent
-		onClicked: chat.positionViewAtIndex(chat.model.idToIndex(timelineManager.replyingEvent), ListView.Contain)
-		cursorShape: Qt.PointingHandCursor
-	}
 }