summary refs log tree commit diff
path: root/resources/qml/MatrixText.qml
diff options
context:
space:
mode:
authortrilene <trilene@runbox.com>2020-10-27 15:29:53 -0400
committertrilene <trilene@runbox.com>2020-10-27 15:29:53 -0400
commitd9ca5309ac0e5f25e0af6cc75a9b31e79a33d4d7 (patch)
treeecf31e7dde13cae5c4c24b256542b77dd31f6d79 /resources/qml/MatrixText.qml
parentSupport video calls (diff)
parentTranslated using Weblate (English) (diff)
downloadnheko-d9ca5309ac0e5f25e0af6cc75a9b31e79a33d4d7.tar.xz
Merge remote-tracking branch 'upstream/master' into webrtc-video
Diffstat (limited to 'resources/qml/MatrixText.qml')
-rw-r--r--resources/qml/MatrixText.qml4
1 files changed, 1 insertions, 3 deletions
diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml

index 6c96a539..a5781c73 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml
@@ -6,8 +6,7 @@ TextEdit { textFormat: TextEdit.RichText readOnly: true wrapMode: Text.Wrap - selectByMouse: true - activeFocusOnPress: false + selectByMouse: !Settings.mobileMode color: colors.text onLinkActivated: { if (/^https:\/\/matrix.to\/#\/(@.*)$/.test(link)) { @@ -29,7 +28,6 @@ TextEdit { id: ma anchors.fill: parent - propagateComposedEvents: true acceptedButtons: Qt.NoButton cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor }