d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-24 20:18:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reimplement mention highlight and scroll to highlight

Browse source
This commit is contained in:
Nicolas Werner 2023-09-20 02:38:06 +02:00
parent 184806bf71
commit 205a42dade
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/MessageView.qml
View file

@ -62,6 +62,7 @@ Item {
delegate: TimelineDefaultMessageStyle { delegate: TimelineDefaultMessageStyle {
messageActions: messageActionsC messageActions: messageActionsC
messageContextMenu: messageContextMenuC messageContextMenu: messageContextMenuC
scrolledToThis: eventId === room.scrollTarget && (y + height > chat.y + chat.contentY && y < chat.y + chat.height + chat.contentY)
} }
footer: Item { footer: Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter

55
resources/qml/TimelineDefaultMessageStyle.qml
View file

@ -39,6 +39,7 @@ TimelineEvent {
required property var reactions required property var reactions
required property int status required property int status
required property int trustlevel required property int trustlevel
required property int notificationlevel
required property int type required property int type
required property bool isEditable required property bool isEditable
@ -48,6 +49,7 @@ TimelineEvent {
property int avatarMargin: (wrapper.isStateEvent || Settings.smallAvatars ? 0 : (Nheko.avatarSize + 8)) // align bubble with section header property int avatarMargin: (wrapper.isStateEvent || Settings.smallAvatars ? 0 : (Nheko.avatarSize + 8)) // align bubble with section header
property alias hovered: messageHover.hovered property alias hovered: messageHover.hovered
property bool scrolledToThis: false
data: [ data: [
Loader { Loader {
@ -84,6 +86,59 @@ TimelineEvent {
onSingleTapped: messageContextMenu.show(wrapper.eventId, wrapper.threadId, wrapper.type, wrapper.isSender, wrapper.isEncrypted, wrapper.isEditable, wrapper.main.hoveredLink, wrapper.main.copyText) onSingleTapped: messageContextMenu.show(wrapper.eventId, wrapper.threadId, wrapper.type, wrapper.isSender, wrapper.isEncrypted, wrapper.isEditable, wrapper.main.hoveredLink, wrapper.main.copyText)
} }
}, },
Rectangle {
id: scrollHighlight
anchors.fill: gridContainer
color: palette.highlight
enabled: false
opacity: 0
visible: true
z: 1
states: State {
name: "revealed"
when: wrapper.scrolledToThis
}
transitions: Transition {
from: ""
to: "revealed"
SequentialAnimation {
PropertyAnimation {
duration: 500
easing.type: Easing.InOutQuad
from: 0
properties: "opacity"
target: scrollHighlight
to: 1
}
PropertyAnimation {
duration: 500
easing.type: Easing.InOutQuad
from: 1
properties: "opacity"
target: scrollHighlight
to: 0
}
ScriptAction {
script: wrapper.room.eventShown()
}
}
}
},
Rectangle {
anchors.top: gridContainer.top
anchors.left: gridContainer.left
anchors.topMargin: -2
anchors.leftMargin: wrapper.avatarMargin + 2
color: "transparent"
border.color: Nheko.theme.red
border.width: wrapper.notificationlevel == MtxEvent.Highlight ? 1 : 0
radius: 4
height: contentColumn.implicitHeight + 4
width: contentColumn.implicitWidth + 4
},
RowLayout { RowLayout {
id: gridContainer id: gridContainer