From 22e8f53e0a362a9f135e4dd8babc94ef7663af03 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Mon, 25 Jul 2022 15:32:04 +0200 Subject: [PATCH] Fix overlay touch events --- .../Sources/ChatControllerNode.swift | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift index 09fd9c55ea..c4e5a59b99 100644 --- a/submodules/TelegramUI/Sources/ChatControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift @@ -793,8 +793,21 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.contentContainerNode.frame = CGRect(origin: CGPoint(), size: layout.size) - let visibleRootModalDismissProgress: CGFloat = 1.0 - self.inputPanelContainerNode.expansionFraction - if self.inputPanelContainerNode.expansionFraction != 0.0 { + let isOverlay: Bool + switch self.chatPresentationInterfaceState.mode { + case .overlay: + isOverlay = true + default: + isOverlay = false + } + + let visibleRootModalDismissProgress: CGFloat + if isOverlay { + visibleRootModalDismissProgress = 1.0 + } else { + visibleRootModalDismissProgress = 1.0 - self.inputPanelContainerNode.expansionFraction + } + if !isOverlay && self.inputPanelContainerNode.expansionFraction != 0.0 { let navigationModalFrame: NavigationModalFrame var animateFromFraction: CGFloat? if let current = self.navigationModalFrame { @@ -886,6 +899,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { containerNode.cornerRadius = 15.0 containerNode.addSubnode(self.backgroundNode) containerNode.addSubnode(self.historyNodeContainer) + self.contentContainerNode.isHidden = true if let restrictedNode = self.restrictedNode { containerNode.addSubnode(restrictedNode) }