Fix attached content file layout

This commit is contained in:
Ilya Laktyushin 2021-07-31 02:33:15 +03:00
parent cf4f852043
commit 7712ad0a27

View File

@ -786,6 +786,8 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
var imageHeightAddition = size.height + 6.0 var imageHeightAddition = size.height + 6.0
if textFrame.size.height > CGFloat.ulpOfOne { if textFrame.size.height > CGFloat.ulpOfOne {
imageHeightAddition += 6.0 imageHeightAddition += 6.0
} else {
imageHeightAddition += 7.0
} }
adjustedBoundingSize.height += imageHeightAddition + 5.0 adjustedBoundingSize.height += imageHeightAddition + 5.0
@ -931,7 +933,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
if let (_, flags) = mediaAndFlags, flags.contains(.preferMediaBeforeText) { if let (_, flags) = mediaAndFlags, flags.contains(.preferMediaBeforeText) {
contentFileNode.frame = CGRect(origin: CGPoint(x: insets.left, y: insets.top), size: contentFileSize) contentFileNode.frame = CGRect(origin: CGPoint(x: insets.left, y: insets.top), size: contentFileSize)
} else { } else {
contentFileNode.frame = CGRect(origin: CGPoint(x: insets.left, y: textFrame.maxY + (textFrame.size.height > CGFloat.ulpOfOne ? 8.0 : 0.0)), size: contentFileSize) contentFileNode.frame = CGRect(origin: CGPoint(x: insets.left, y: textFrame.maxY + (textFrame.size.height > CGFloat.ulpOfOne ? 8.0 : 7.0)), size: contentFileSize)
} }
} else if let contentFileNode = strongSelf.contentFileNode { } else if let contentFileNode = strongSelf.contentFileNode {
contentFileNode.removeFromSupernode() contentFileNode.removeFromSupernode()