rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve styling of emote messages

This commit is contained in:
Nicolas Werner 2020-02-09 01:24:24 +01:00
parent c5af3543e6
commit 284fc8eaa8
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/delegates/MessageDelegate.qml
View File

@ -32,7 +32,10 @@ Item {
} }
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.EmoteMessage roleValue: MtxEvent.EmoteMessage
TextMessage {} NoticeMessage {
formatted: chat.model.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
color: chat.model.userColor(modelData.userId, colors.window)
}
} }
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.ImageMessage roleValue: MtxEvent.ImageMessage
@ -69,19 +72,19 @@ Item {
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.Name roleValue: MtxEvent.Name
NoticeMessage { NoticeMessage {
notice: model.data.roomName ? qsTr("room name changed to: %1").arg(model.data.roomName) : qsTr("removed room name") text: model.data.roomName ? qsTr("room name changed to: %1").arg(model.data.roomName) : qsTr("removed room name")
} }
} }
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.Topic roleValue: MtxEvent.Topic
NoticeMessage { NoticeMessage {
notice: model.data.roomTopic ? qsTr("topic changed to: %1").arg(model.data.roomTopic) : qsTr("removed topic") text: model.data.roomTopic ? qsTr("topic changed to: %1").arg(model.data.roomTopic) : qsTr("removed topic")
} }
} }
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.Member roleValue: MtxEvent.Member
NoticeMessage { NoticeMessage {
notice: timelineManager.timeline.formatMemberEvent(model.data.id); text: timelineManager.timeline.formatMemberEvent(model.data.id);
} }
} }
DelegateChoice { DelegateChoice {

7
resources/qml/delegates/NoticeMessage.qml
View File

@ -1,9 +1,4 @@
import ".." TextMessage {
MatrixText {
property string notice: model.data.formattedBody.replace("<pre>", "<pre style='white-space: pre-wrap'>")
text: notice
width: parent ? parent.width : undefined
font.italic: true font.italic: true
color: inactiveColors.text color: inactiveColors.text
} }

3
resources/qml/delegates/TextMessage.qml
View File

@ -1,6 +1,7 @@
import ".." import ".."
MatrixText { MatrixText {
text: model.data.formattedBody.replace("<pre>", "<pre style='white-space: pre-wrap'>") property string formatted: model.data.formattedBody
text: formatted.replace("<pre>", "<pre style='white-space: pre-wrap'>")
width: parent ? parent.width : undefined width: parent ? parent.width : undefined
} }