status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-20 10:38:47 +00:00
Code Issues Projects Releases Wiki Activity

fix(Chat): align emojis within chat inputs properly

Browse Source 
Fixes #1944
This commit is contained in:
Pascal Precht 2021-03-23 11:33:53 +01:00 committed by Iuri Matias
parent 2a9f9118a1
commit 5091e258d3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/imports/Emoji.qml
View File

@ -8,7 +8,7 @@ QtObject {
readonly property var size: { readonly property var size: {
"big": "72x72", "big": "72x72",
"middle": "32x32", "middle": "32x32",
"small": "20x20" "small": "18x18"
} }
property string base: Qt.resolvedUrl("twemoji/") property string base: Qt.resolvedUrl("twemoji/")
function parse(text, renderSize = size.small) { function parse(text, renderSize = size.small) {
@ -21,24 +21,30 @@ QtObject {
Twemoji.twemoji.ext = ".svg" Twemoji.twemoji.ext = ".svg"
Twemoji.twemoji.size = "svg" Twemoji.twemoji.size = "svg"
return Twemoji.twemoji.parse(text, { return Twemoji.twemoji.parse(text, {
attributes: function() { return { width: renderSizes[0], height: renderSizes[1] }} attributes: function() {
return {
width: renderSizes[0],
height: renderSizes[1],
style: "vertical-align: top"
}
}
}) })
} }
function fromCodePoint(value) { function fromCodePoint(value) {
return Twemoji.twemoji.convert.fromCodePoint(value) return Twemoji.twemoji.convert.fromCodePoint(value)
} }
function deparse(value) { function deparse(value) {
return value.replace(/<img src=\"qrc:\/imports\/twemoji\/.+?" alt=\"(.+?)\" width=\"[0-9]*\" height=\"[0-9]*\" \/>/g, "$1"); return value.replace(/<img src=\"qrc:\/imports\/twemoji\/.+?" alt=\"(.+?)\" width=\"[0-9]*\" height=\"[0-9]*\" style=\"(.+?)\" \/>/g, "$1");
} }
function deparseFromParse(value) { function deparseFromParse(value) {
return value.replace(/<img class=\"emoji\" draggable=\"false\" alt=\"(.+?)\" src=\"qrc:\/imports\/twemoji\/.+?" width=\"[0-9]*\" height=\"[0-9]*\"\/>/g, "$1"); return value.replace(/<img class=\"emoji\" draggable=\"false\" alt=\"(.+?)\" src=\"qrc:\/imports\/twemoji\/.+?" width=\"[0-9]*\" height=\"[0-9]*\" style=\"(.+?)\" \/>/g, "$1");
} }
function hasEmoji(value) { function hasEmoji(value) {
let match = value.match(/<img src=\"qrc:\/imports\/twemoji\/.+?" alt=\"(.+?)\" width=\"[0-9]*\" height=\"[0-9]*\"\ \/>/g) let match = value.match(/<img src=\"qrc:\/imports\/twemoji\/.+?" alt=\"(.+?)\" width=\"[0-9]*\" height=\"[0-9]*\" style=\"(.+?)\" \/>/g)
return match && match.length > 0 return match && match.length > 0
} }
function getEmojis(value) { function getEmojis(value) {
return value.match(/<img class=\"emoji\" draggable=\"false\" alt=\"(.+?)\" src=\"qrc:\/imports\/twemoji\/.+?" width=\"[0-9]*\" height=\"[0-9]*\"\/>/g, "$1"); return value.match(/<img class=\"emoji\" draggable=\"false\" alt=\"(.+?)\" src=\"qrc:\/imports\/twemoji\/.+?" width=\"[0-9]*\" height=\"[0-9]*\" style=\"(.+?)\" \/>/g, "$1");
} }
function getEmojiUnicode(shortname) { function getEmojiUnicode(shortname) {
var _emoji; var _emoji;