From f7f147818834d023ede1456067ed6fb6a30c1526 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 22 Nov 2023 14:29:18 +0400 Subject: [PATCH] Various fixes --- .../MediaEditorScreen/Sources/MediaEditorScreen.swift | 4 ++-- .../PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift | 2 +- submodules/TelegramUI/Sources/ChatController.swift | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift index 4473f1b2d4..f3ab7e5434 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift @@ -2915,7 +2915,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate private weak var muteTooltip: ViewController? func presentMutedTooltip() { - guard let sourceView = self.componentHost.findTaggedView(tag: muteButtonTag) else { + guard let mediaEditor = self.mediaEditor, let sourceView = self.componentHost.findTaggedView(tag: muteButtonTag) else { return } @@ -2931,7 +2931,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate let location = CGRect(origin: CGPoint(x: absoluteFrame.midX, y: absoluteFrame.maxY + 3.0), size: CGSize()) let text: String - if let _ = self.mediaEditor?.values.audioTrack { + if mediaEditor.values.audioTrack != nil || mediaEditor.values.additionalVideoPath != nil { if isMuted { text = self.presentationData.strings.Story_Editor_TooltipMutedWithAudio } else { diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift index 5d2c3d6520..bd187ae8b3 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift @@ -3027,7 +3027,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro })) ] } - let contextController = ContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture) + let contextController = ContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, passthroughTouches: true)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture) controller.presentInGlobalOverlay(contextController) } diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index ba0eb07469..bfbc1b9a17 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -4514,7 +4514,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G |> afterCompleted { [weak self] in Queue.mainQueue().async { if let self { - self.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Chat_SimilarChannels_JoinedChannel(peer.compactDisplayTitle).string, timeout: nil, customUndoText: nil), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root)) + self.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Chat_SimilarChannels_JoinedChannel(peer.compactDisplayTitle).string, timeout: nil, customUndoText: nil), elevatedLayout: false, position: .top animateInAsReplacement: false, action: { _ in return false }), in: .current) } } } @@ -4543,7 +4543,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.canReadHistory.set(false) - let contextController = ContextController(presentationData: self.presentationData, source: .controller(ChatContextControllerContentSourceImpl(controller: chatController, sourceView: sourceView, passthroughTouches: false)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture) + let contextController = ContextController(presentationData: self.presentationData, source: .controller(ChatContextControllerContentSourceImpl(controller: chatController, sourceView: sourceView, passthroughTouches: true)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture) contextController.dismissed = { [weak self] in self?.canReadHistory.set(true) }