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 text rendering

Browse Source
This commit is contained in:
Isaac
2024-06-18 16:51:27 +04:00
parent b129ba1e83
commit bdc3b9d89c
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramUI/Components/InteractiveTextComponent/Sources/InteractiveTextComponent.swift
View File

@@ -1618,7 +1618,11 @@ open class InteractiveTextNode: ASDisplayNode, TextNodeProtocol, UIGestureRecogn
size.width = max(size.width, titleLine.frame.origin.x + titleLine.frame.width + segment.additionalWidth) size.width = max(size.width, titleLine.frame.origin.x + titleLine.frame.width + segment.additionalWidth)
} }
for line in segment.lines { for line in segment.lines {
size.width = max(size.width, line.frame.origin.x + line.frame.width + segment.additionalWidth) var additionalTrailingWidth: CGFloat = 0.0
if let additionalTrailingLine = line.additionalTrailingLine {
additionalTrailingWidth += CTLineGetTypographicBounds(additionalTrailingLine.0, nil, nil, nil)
}
size.width = max(size.width, line.frame.origin.x + line.frame.width + segment.additionalWidth + additionalTrailingWidth)
} }
} }
@@ -1685,7 +1689,11 @@ open class InteractiveTextNode: ASDisplayNode, TextNodeProtocol, UIGestureRecogn
effectiveSegmentHeight += line.frame.height effectiveSegmentHeight += line.frame.height
visibleLineCount = i + 1 visibleLineCount = i + 1
} }
blockWidth = max(blockWidth, line.frame.origin.x + line.frame.width) var additionalTrailingWidth: CGFloat = 0.0
if let additionalTrailingLine = line.additionalTrailingLine {
additionalTrailingWidth += CTLineGetTypographicBounds(additionalTrailingLine.0, nil, nil, nil)
}
blockWidth = max(blockWidth, line.frame.origin.x + line.frame.width + additionalTrailingWidth)
if let range = line.range { if let range = line.range {
attributedString.enumerateAttributes(in: range, options: []) { attributes, range, _ in attributedString.enumerateAttributes(in: range, options: []) { attributes, range, _ in
@@ -1875,6 +1883,11 @@ open class InteractiveTextNode: ASDisplayNode, TextNodeProtocol, UIGestureRecogn
var lineRect = line.frame var lineRect = line.frame
lineRect.origin.y = topLeftOffset.y + line.frame.minY lineRect.origin.y = topLeftOffset.y + line.frame.minY
lineRect.origin.x = topLeftOffset.x + line.frame.minX lineRect.origin.x = topLeftOffset.x + line.frame.minX
if let additionalTrailingLine = line.additionalTrailingLine {
lineRect.size.width += CTLineGetTypographicBounds(additionalTrailingLine.0, nil, nil, nil)
}
if segmentRect.isEmpty { if segmentRect.isEmpty {
segmentRect = lineRect segmentRect = lineRect
} else { } else {
@@ -2304,7 +2317,7 @@ final class TextContentItemLayer: SimpleLayer {
} }
} }
if !line.strikethroughs.isEmpty { /*if !line.strikethroughs.isEmpty {
for strikethrough in line.strikethroughs { for strikethrough in line.strikethroughs {
guard let lineRange = line.range else { guard let lineRange = line.range else {
continue continue
@@ -2321,7 +2334,7 @@ final class TextContentItemLayer: SimpleLayer {
let frame = strikethrough.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY) let frame = strikethrough.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)
context.fill(CGRect(x: frame.minX, y: frame.minY - 5.0, width: frame.width, height: 1.0)) context.fill(CGRect(x: frame.minX, y: frame.minY - 5.0, width: frame.width, height: 1.0))
} }
} }*/
if let (additionalTrailingLine, _) = line.additionalTrailingLine { if let (additionalTrailingLine, _) = line.additionalTrailingLine {
context.textPosition = CGPoint(x: lineFrame.minX + line.intrinsicWidth, y: lineFrame.maxY - line.descent) context.textPosition = CGPoint(x: lineFrame.minX + line.intrinsicWidth, y: lineFrame.maxY - line.descent)