thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix emoji font mixing in reactions

Browse source
This commit is contained in:
Nicolas Werner 2025-04-04 15:04:25 +02:00
parent 5cfc8b55e3
commit 11d6bed825
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Completer.qml
View file

@ -182,7 +182,7 @@ Control {
Label {
color: model.index == popup.currentIndex ? palette.highlightedText : palette.text
font: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
text: model.unicode
visible: !!model.unicode
}

2
resources/qml/MessageView.qml
View file

@ -206,7 +206,7 @@ Item {
anchors.centerIn: parent
color: button.hovered ? button.highlightColor : button.buttonTextColor
font.family: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
horizontalAlignment: Text.AlignHCenter
padding: 0
text: button.modelData

4
resources/qml/Reactions.qml
View file

@ -49,7 +49,7 @@ Flow {
elide: Text.ElideRight
elideWidth: 150
font.family: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
text: modelData.displayKey
}
Text {
@ -57,7 +57,7 @@ Flow {
anchors.baseline: reactionCounter.baseline
color: (reaction.hovered || modelData.selfReactedEvent !== '') ? palette.highlightedText : palette.text
font.family: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
textFormat: TextEdit.RichText
maximumLineCount: 1
text: {

2
resources/qml/device-verification/EmojiVerification.qml
View file

@ -372,7 +372,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter
text: col.emoji.emoji
font.pixelSize: Qt.application.font.pixelSize * 2
font.family: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
color: palette.text
}

2
resources/qml/emoji/StickerPicker.qml
View file

@ -183,7 +183,7 @@ Menu {
height: stickerDim
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.family: Settings.emojiFont
font.family: Settings.emojiFont != "" ? Settings.emojiFont : undefined
font.pixelSize: 36
text: del.modelData.unicode.replace('\ufe0f', '')
}