diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-01-21 20:41:09 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-01-21 20:41:09 +0100 |
| commit | c95f4d82769b9eb5836f0ffbf9f87e054c393cec (patch) | |
| tree | c8d3b3d9185a7c954e2e8919a634f574a6520e69 /resources/qml | |
| parent | Improve emoji escaping (diff) | |
| download | nheko-c95f4d82769b9eb5836f0ffbf9f87e054c393cec.tar.xz | |
Fix colors in typing display, when username contains emoji
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/Avatar.qml | 3 | ||||
| -rw-r--r-- | resources/qml/TimelineView.qml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index a53f057b..25fff7f3 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -19,7 +19,8 @@ Rectangle { Text { anchors.fill: parent - text: String.fromCodePoint(displayName.codePointAt(0)) + text: chat.model.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0))) + textFormat: Text.RichText color: colors.text font.pixelSize: avatar.height/2 verticalAlignment: Text.AlignVCenter diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 60a8e6c1..a93f50c0 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -206,6 +206,7 @@ Item { id: typingDisplay text: chat.model ? chat.model.formatTypingUsers(chat.model.typingUsers, chatFooter.color) : "" + textFormat: Text.RichText color: colors.windowText } } |