From 4ca0e55d15ef4142bd9db5dba6116b74dfc40be1 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Mon, 3 Jul 2023 12:35:41 +0200 Subject: [PATCH] Fix link preview layout --- .../Sources/ChatMessageAttachedContentNode.swift | 11 +++++++++-- .../Sources/ChatMessageInteractiveMediaNode.swift | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift index 809f4a24f3..9ab5f25b15 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift @@ -526,11 +526,18 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { } } - if preferMediaBeforeText { + if preferMediaBeforeText, let textString, textString.length != 0 { isImage = false } - let statusInText = !isImage + var statusInText = !isImage + if let textString { + if textString.length == 0 { + statusInText = false + } + } else { + statusInText = false + } switch preparePosition { case .linear(_, .None), .linear(_, .Neighbour(true, _, _)): diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift index 00d6a6e485..f48f5dcaf8 100644 --- a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift @@ -893,7 +893,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio return (resultWidth, { boundingWidth in var boundingSize: CGSize - let drawingSize: CGSize + var drawingSize: CGSize switch sizeCalculation { case .constrained: @@ -918,6 +918,9 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio case .aspectFill: drawingSize = nativeSize.aspectFilled(boundingSize) } + if additionalWidthConstrainment { + drawingSize.height = drawingSize.width * (1920.0 / 1080.0) + } } case .unconstrained: boundingSize = constrainedSize