ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-17 11:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter 2016-06-17 00:59:40 +03:00
parent 572a74e278
commit f701b45c05
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Display/ListView.swift
View File

@ -1794,13 +1794,13 @@ public final class ListView: ASDisplayNode, UIScrollViewDelegate {
takenAnimation = true takenAnimation = true
if abs(layout.size.height - previousApparentHeight) > CGFloat(FLT_EPSILON) { if abs(layout.size.height - previousApparentHeight) > CGFloat(FLT_EPSILON) {
node.addApparentHeightAnimation(layout.size.height, duration: insertionAnimationDuration, beginAt: timestamp, update: { [weak node] progress in node.addApparentHeightAnimation(layout.size.height, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp, update: { [weak node] progress in
if let node = node { if let node = node {
node.animateFrameTransition(progress) node.animateFrameTransition(progress)
} }
}) })
node.transitionOffset = previousApparentHeight - layout.size.height node.transitionOffset += previousApparentHeight - layout.size.height
node.addTransitionOffsetAnimation(0.0, duration: insertionAnimationDuration, beginAt: timestamp) node.addTransitionOffsetAnimation(0.0, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp)
} }
} }
} }
@ -1811,10 +1811,18 @@ public final class ListView: ASDisplayNode, UIScrollViewDelegate {
node.addApparentHeightAnimation(0.0, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp) node.addApparentHeightAnimation(0.0, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp)
} else if animated { } else if animated {
if !takenAnimation { if !takenAnimation {
node.addApparentHeightAnimation(nodeFrame.size.height, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp) node.addApparentHeightAnimation(nodeFrame.size.height, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp, update: { [weak node] progress in
if let node = node {
node.animateFrameTransition(progress)
}
})
if let previousFrame = previousFrame { if let previousFrame = previousFrame {
node.transitionOffset += nodeFrame.origin.y - previousFrame.origin.y if self.debugInfo {
assert(true)
}
node.transitionOffset += nodeFrame.origin.y - previousFrame.origin.y - previousApparentHeight + layout.size.height
node.addTransitionOffsetAnimation(0.0, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp) node.addTransitionOffsetAnimation(0.0, duration: insertionAnimationDuration * UIView.animationDurationFactor(), beginAt: timestamp)
if previousInsets != layout.insets { if previousInsets != layout.insets {
node.insets = previousInsets node.insets = previousInsets