ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-04-18 20:11:55 +04:00
parent ff2dad403c
commit 1f7685b9fb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/AttachmentUI/Sources/AttachmentContainer.swift
View File

@ -209,18 +209,18 @@ final class AttachmentContainer: ASDisplayNode, UIGestureRecognizerDelegate {
if case let .known(value) = visibleContentOffset, value <= epsilon { if case let .known(value) = visibleContentOffset, value <= epsilon {
if let scrollView = scrollView { if let scrollView = scrollView {
scrollView.bounces = false scrollView.bounces = false
scrollView.setContentOffset(CGPoint(x: 0.0, y: 0.0), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: 0.0), animated: false)
} }
} else if let scrollView = scrollView, contentOffset <= -scrollView.contentInset.top + epsilon { } else if let scrollView = scrollView, contentOffset <= -scrollView.contentInset.top + epsilon {
scrollView.bounces = false scrollView.bounces = false
scrollView.setContentOffset(CGPoint(x: 0.0, y: -scrollView.contentInset.top), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: -scrollView.contentInset.top), animated: false)
} else if let scrollView = scrollView { } else if let scrollView = scrollView {
translation = panOffset translation = panOffset
currentOffset = topInset + translation currentOffset = topInset + translation
if self.isExpanded { if self.isExpanded {
recognizer.setTranslation(CGPoint(), in: self.view) recognizer.setTranslation(CGPoint(), in: self.view)
} else if currentOffset > 0.0 { } else if currentOffset > 0.0 {
scrollView.setContentOffset(CGPoint(x: 0.0, y: -scrollView.contentInset.top), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: -scrollView.contentInset.top), animated: false)
} }
} }
@ -287,7 +287,7 @@ final class AttachmentContainer: ASDisplayNode, UIGestureRecognizerDelegate {
if let listNode = listNode { if let listNode = listNode {
listNode.scroller.setContentOffset(CGPoint(), animated: false) listNode.scroller.setContentOffset(CGPoint(), animated: false)
} else if let scrollView = scrollView { } else if let scrollView = scrollView {
scrollView.setContentOffset(CGPoint(x: 0.0, y: -scrollView.contentInset.top), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: -scrollView.contentInset.top), animated: false)
} }
let distance = topInset - offset let distance = topInset - offset
@ -318,9 +318,9 @@ final class AttachmentContainer: ASDisplayNode, UIGestureRecognizerDelegate {
if let listNode = listNode { if let listNode = listNode {
listNode.scroller.setContentOffset(CGPoint(), animated: false) listNode.scroller.setContentOffset(CGPoint(), animated: false)
} else if let scrollView = scrollView { } else if let scrollView = scrollView {
scrollView.setContentOffset(CGPoint(x: 0.0, y: -scrollView.contentInset.top), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: -scrollView.contentInset.top), animated: false)
Queue.mainQueue().after(0.01, { Queue.mainQueue().after(0.01, {
scrollView.setContentOffset(CGPoint(x: 0.0, y: -scrollView.contentInset.top), animated: false) scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: -scrollView.contentInset.top), animated: false)
}) })
} }

3
submodules/LegacyComponents/Sources/TGMemoryImageCache.m
View File

@ -127,7 +127,6 @@
return; return;
} }
__block id result = nil;
[_queue dispatch:^ [_queue dispatch:^
{ {
TGMemoryImageCacheItem *item = _cache[key]; TGMemoryImageCacheItem *item = _cache[key];
@ -139,6 +138,8 @@
*attributes = item.attributes; *attributes = item.attributes;
completion(item.object); completion(item.object);
} else {
completion(nil);
} }
}]; }];
} }