ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix video message context menu

Browse Source
This commit is contained in:
Ali 2020-03-31 16:12:06 +04:00
parent a0eeff1998
commit 0dff5a3274
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/Display/Source/ContextControllerSourceNode.swift
View File

@ -57,7 +57,7 @@ public final class ContextControllerSourceNode: ASDisplayNode {
}
let scaleSide = targetContentRect.width
let minScale: CGFloat = (scaleSide - 15.0) / scaleSide
let minScale: CGFloat = max(0.7, (scaleSide - 15.0) / scaleSide)
let currentScale = 1.0 * (1.0 - progress) + minScale * progress
let originalCenterOffsetX: CGFloat = targetNode.bounds.width / 2.0 - targetContentRect.midX

9
submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
View File

@ -45,6 +45,8 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
private var currentSwipeToReplyTranslation: CGFloat = 0.0
private var recognizer: TapLongTapOrDoubleTapGestureRecognizer?
override var visibility: ListViewItemNodeVisibility {
didSet {
let wasVisible = oldValue != .none
@ -90,12 +92,12 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
guard let strongSelf = self, let item = strongSelf.item else {
return
}
if let action = strongSelf.gestureRecognized(gesture: .longTap, location: location, recognizer: nil) {
switch action {
case .action, .optionalAction:
break
case let .openContextMenu(tapMessage, selectAll, subFrame):
strongSelf.recognizer?.cancel()
item.controllerInteraction.openMessageContextMenu(tapMessage, selectAll, strongSelf, subFrame, gesture)
}
}
@ -115,6 +117,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
super.didLoad()
let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:)))
self.recognizer = recognizer
recognizer.tapActionAtPoint = { [weak self] point in
if let strongSelf = self {
if let shareButtonNode = strongSelf.shareButtonNode, shareButtonNode.frame.contains(point) {
@ -716,8 +719,8 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
}
return nil
case .longTap, .doubleTap:
if let item = self.item, let videoContentNode = self.interactiveVideoNode.videoContentNode(at: self.view.convert(location, to: self.interactiveVideoNode.view)) {
return .openContextMenu(tapMessage: item.message, selectAll: false, subFrame: videoContentNode.view.convert(videoContentNode.bounds, to: self.view))
if let item = self.item, self.interactiveVideoNode.frame.contains(location) {
return .openContextMenu(tapMessage: item.message, selectAll: false, subFrame: self.interactiveVideoNode.frame)
}
case .hold:
break