ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Port timeline mouseare to tap handler"

Browse Source 
This reverts commit d63811471c.
This commit is contained in:
Carl Schwan
2020-12-03 17:50:27 +01:00
parent 735008c74c
commit 5ed47e7397
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
imports/NeoChat/Component/Timeline/MessageDelegate.qml
View File

@@ -26,13 +26,13 @@ RowLayout {
readonly property color authorColor: eventType == "notice" ? Kirigami.Theme.activeTextColor : author.color
readonly property color replyAuthorColor: replyVisible ? reply.author.color : Kirigami.Theme.focusColor
property alias mouseArea: controlContainer.children
property bool isEmote: false
signal saveFileAs()
signal openExternally()
signal replyClicked(string eventID)
signal replyToMessageClicked(var replyUser, string replyContent, string eventID)
signal openContextMenu()
id: root
@@ -80,11 +80,6 @@ RowLayout {
topPadding: 0
bottomPadding: 0
hoverEnabled: true
TapHandler {
acceptedButtons: (Kirigami.Settings.isMobile ? Qt.LeftButton : 0) | Qt.RightButton
onTapped: openContextMenu()
onLongPressed: openContextMenu()
}
contentItem: ColumnLayout {
id: column
spacing: showAuthor ? Kirigami.Units.smallSpacing : 0

17
imports/NeoChat/Page/RoomPage.qml
View File

@@ -250,7 +250,11 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
Layout.maximumWidth: messageListView.width
isEmote: true
onOpenContextMenu: openMessageContext(author, display, eventId, toolTip)
mouseArea: MouseArea {
acceptedButtons: Qt.RightButton
anchors.fill: parent
onClicked: openMessageContext(author, display, eventId, toolTip);
}
onReplyClicked: goToEvent(eventID)
onReplyToMessageClicked: replyToMessage(replyUser, replyContent, eventId);
innerObject: [
@@ -276,7 +280,16 @@ Kirigami.ScrollablePage {
innerObject: MessageDelegate {
Layout.fillWidth: true
Layout.maximumWidth: messageListView.width
onOpenContextMenu: openMessageContext(author, display, eventId, toolTip)
mouseArea: MouseArea {
acceptedButtons: (Kirigami.Settings.isMobile ? Qt.LeftButton : 0) | Qt.RightButton
anchors.fill: parent
onClicked: {
if (mouse.button == Qt.RightButton) {
openMessageContext(author, display, eventId, toolTip);
}
}
onPressAndHold: openMessageContext(author, display, eventId, toolTip);
}
onReplyClicked: goToEvent(eventID)
onReplyToMessageClicked: replyToMessage(replyUser, replyContent, eventId);
innerObject: [