ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter
2017-09-26 03:01:24 +03:00
parent 266d87d1e7
commit 46295401ff
215 changed files with 8023 additions and 2327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
TelegramUI/ChatMessageInteractiveMediaNode.swift
View File

@@ -93,10 +93,17 @@ final class ChatMessageInteractiveMediaNode: ASTransformNode {
@objc func imageTap(_ recognizer: UITapGestureRecognizer) {
if case .ended = recognizer.state {
let point = recognizer.location(in: self.imageNode.view)
if let fetchStatus = self.fetchStatus, case .Local = fetchStatus {
self.activateLocalContent()
} else {
self.progressPressed()
if let (_, flags) = self.messageIdAndFlags, flags.isSending {
if let statusNode = self.statusNode, statusNode.frame.contains(point) {
self.progressPressed()
}
} else {
self.progressPressed()
}
}
}
}
@@ -174,7 +181,8 @@ final class ChatMessageInteractiveMediaNode: ASTransformNode {
if isSecretMedia {
resultWidth = maxWidth
} else {
resultWidth = min(maxWidth, nativeSize.width)
//resultWidth = min(maxWidth, nativeSize.width)
resultWidth = min(constrainedSize.width, nativeSize.aspectFitted(layoutConstants.image.maxDimensions).width)
}
return (resultWidth, { boundingWidth in
@@ -185,8 +193,9 @@ final class ChatMessageInteractiveMediaNode: ASTransformNode {
boundingSize = CGSize(width: maxWidth, height: maxWidth)
drawingSize = nativeSize.aspectFilled(boundingSize)
} else {
drawingSize = nativeSize.fittedToWidthOrSmaller(boundingWidth)
boundingSize = CGSize(width: max(boundingWidth, drawingSize.width), height: drawingSize.height).cropped(CGSize(width: CGFloat.greatestFiniteMagnitude, height: layoutConstants.image.maxDimensions.height))
let fittedSize = nativeSize.fittedToWidthOrSmaller(boundingWidth)
boundingSize = CGSize(width: boundingWidth, height: fittedSize.height).cropped(CGSize(width: CGFloat.greatestFiniteMagnitude, height: layoutConstants.image.maxDimensions.height))
drawingSize = nativeSize.fitted(boundingSize)
}
var updateImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?
@@ -272,7 +281,11 @@ final class ChatMessageInteractiveMediaNode: ASTransformNode {
updatedStatusSignal = combineLatest(chatMessagePhotoStatus(account: account, photo: image), account.pendingMessageManager.pendingMessageStatus(message.id))
|> map { resourceStatus, pendingStatus -> MediaResourceStatus in
if let pendingStatus = pendingStatus {
return .Fetching(progress: pendingStatus.progress)
var progress = pendingStatus.progress
if pendingStatus.isRunning {
progress = max(progress, 0.027)
}
return .Fetching(progress: progress)
} else {
return resourceStatus
}
@@ -284,7 +297,11 @@ final class ChatMessageInteractiveMediaNode: ASTransformNode {
updatedStatusSignal = combineLatest(chatMessageFileStatus(account: account, file: file), account.pendingMessageManager.pendingMessageStatus(message.id))
|> map { resourceStatus, pendingStatus -> MediaResourceStatus in
if let pendingStatus = pendingStatus {
return .Fetching(progress: pendingStatus.progress)
var progress = pendingStatus.progress
if pendingStatus.isRunning {
progress = max(progress, 0.027)
}
return .Fetching(progress: progress)
} else {
return resourceStatus
}