Merge remote-tracking branch 'origin/master' into cross-signing
This commit is contained in:
commit
4802c34009
43 changed files with 8773 additions and 2200 deletions
|
|
@ -16,7 +16,7 @@ Rectangle {
|
|||
|
||||
Label {
|
||||
anchors.fill: parent
|
||||
text: chat.model.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0)))
|
||||
text: TimelineManager.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0)))
|
||||
textFormat: Text.RichText
|
||||
font.pixelSize: avatar.height/2
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
|
@ -52,6 +52,8 @@ Rectangle {
|
|||
anchors.bottom: avatar.bottom
|
||||
anchors.right: avatar.right
|
||||
|
||||
visible: !!userid
|
||||
|
||||
height: avatar.height / 6
|
||||
width: height
|
||||
radius: Settings.avatarCircles ? height / 2 : height / 4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue