ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handshake emoji display

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-02-02 03:02:03 +04:00
parent 25e57e15c9
commit c959e060c1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/Display/Source/TextNode.swift
View File

@@ -1510,7 +1510,7 @@ open class TextNode: ASDisplayNode {
continue continue
} }
var fixCoupleEmoji = false var fixDoubleEmoji = false
if glyphCount == 2, let font = attributes["NSFont"] as? UIFont, font.fontName.contains("ColorEmoji"), let string = layout.attributedString { if glyphCount == 2, let font = attributes["NSFont"] as? UIFont, font.fontName.contains("ColorEmoji"), let string = layout.attributedString {
let range = CTRunGetStringRange(run) let range = CTRunGetStringRange(run)
let substring = string.attributedSubstring(from: NSMakeRange(range.location, range.length)).string let substring = string.attributedSubstring(from: NSMakeRange(range.location, range.length)).string
@@ -1518,17 +1518,21 @@ open class TextNode: ASDisplayNode {
let heart = Unicode.Scalar(0x2764)! let heart = Unicode.Scalar(0x2764)!
let man = Unicode.Scalar(0x1F468)! let man = Unicode.Scalar(0x1F468)!
let woman = Unicode.Scalar(0x1F469)! let woman = Unicode.Scalar(0x1F469)!
let leftHand = Unicode.Scalar(0x1FAF1)!
let rightHand = Unicode.Scalar(0x1FAF2)!
if substring.unicodeScalars.contains(heart) && (substring.unicodeScalars.contains(man) || substring.unicodeScalars.contains(woman)) { if substring.unicodeScalars.contains(heart) && (substring.unicodeScalars.contains(man) || substring.unicodeScalars.contains(woman)) {
fixCoupleEmoji = true fixDoubleEmoji = true
} else if substring.unicodeScalars.contains(leftHand) && substring.unicodeScalars.contains(rightHand) {
fixDoubleEmoji = true
} }
} }
if fixCoupleEmoji { if fixDoubleEmoji {
context.setBlendMode(.normal) context.setBlendMode(.normal)
} }
CTRunDraw(run, context, CFRangeMake(0, glyphCount)) CTRunDraw(run, context, CFRangeMake(0, glyphCount))
if fixCoupleEmoji { if fixDoubleEmoji {
context.setBlendMode(blendMode) context.setBlendMode(blendMode)
} }
} }