@@ -528,7 +528,10 @@ final class AttachmentContainer: ASDisplayNode, ASGestureRecognizerDelegate {
528528 var containerTopInset : CGFloat
529529 if isLandscape || isFullscreen {
530530 containerTopInset = 0.0
531- containerLayout = layout
531+
532+ var safeInsets = layout. safeInsets
533+ safeInsets. top = isFullscreen ? 0.000001 : 0.0
534+ containerLayout = layout. withUpdatedSafeInsets ( safeInsets)
532535
533536 let unscaledFrame = CGRect ( origin: CGPoint ( ) , size: containerLayout. size)
534537 containerScale = 1.0
@@ -550,7 +553,7 @@ final class AttachmentContainer: ASDisplayNode, ASGestureRecognizerDelegate {
550553
551554 var additionalInsets = layout. additionalInsets
552555 additionalInsets. bottom = topInset
553-
556+
554557 containerLayout = ContainerViewLayout ( size: CGSize ( width: layout. size. width + overflowInset * 2.0 , height: layout. size. height - containerTopInset) , metrics: layout. metrics, deviceMetrics: layout. deviceMetrics, intrinsicInsets: UIEdgeInsets ( top: 0.0 , left: intrinsicInsets. left, bottom: intrinsicInsets. bottom, right: intrinsicInsets. right) , safeInsets: UIEdgeInsets ( top: 0.0 , left: safeInsets. left, bottom: safeInsets. bottom, right: safeInsets. right) , additionalInsets: additionalInsets, statusBarHeight: nil , inputHeight: layout. inputHeight, inputHeightIsInteractivellyChanging: layout. inputHeightIsInteractivellyChanging, inVoiceOver: layout. inVoiceOver)
555558 let unscaledFrame = CGRect ( origin: CGPoint ( x: 0.0 , y: containerTopInset - coveredByModalTransition * 10.0 ) , size: containerLayout. size)
556559 let maxScale : CGFloat = ( containerLayout. size. width - 16.0 * 2.0 ) / containerLayout. size. width
@@ -562,7 +565,7 @@ final class AttachmentContainer: ASDisplayNode, ASGestureRecognizerDelegate {
562565 clipFrame = CGRect ( x: containerFrame. minX + overflowInset, y: containerFrame. minY, width: containerFrame. width - overflowInset * 2.0 , height: containerFrame. height)
563566 }
564567 } else {
565- containerLayout = ContainerViewLayout ( size: layout. size, metrics: layout. metrics, deviceMetrics: layout. deviceMetrics, intrinsicInsets: UIEdgeInsets ( top: 0.0 , left: 0.0 , bottom: layout. intrinsicInsets. bottom, right: 0.0 ) , safeInsets: UIEdgeInsets ( ) , additionalInsets: UIEdgeInsets ( ) , statusBarHeight: isFullscreen ? layout. statusBarHeight : nil , inputHeight: isFullscreen ? layout. inputHeight : nil , inputHeightIsInteractivellyChanging: false , inVoiceOver: layout. inVoiceOver)
568+ containerLayout = ContainerViewLayout ( size: layout. size, metrics: layout. metrics, deviceMetrics: layout. deviceMetrics, intrinsicInsets: UIEdgeInsets ( top: 0.0 , left: 0.0 , bottom: layout. intrinsicInsets. bottom, right: 0.0 ) , safeInsets: . zero , additionalInsets: . zero , statusBarHeight: isFullscreen ? layout. statusBarHeight : nil , inputHeight: isFullscreen ? layout. inputHeight : nil , inputHeightIsInteractivellyChanging: false , inVoiceOver: layout. inVoiceOver)
566569
567570 let unscaledFrame = CGRect ( origin: CGPoint ( ) , size: containerLayout. size)
568571 containerScale = 1.0
0 commit comments