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

Video editor fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2020-05-27 22:42:08 +03:00
parent 4ff5cede1e
commit 451e033dd1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
submodules/TelegramUI/Sources/DrawingStickersScreen.swift
View File

@ -29,7 +29,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
private var inputNodeInteraction: ChatMediaInputNodeInteraction! private var inputNodeInteraction: ChatMediaInputNodeInteraction!
private let collectionListPanel: ASDisplayNode private let collectionListPanel: ASDisplayNode
private let collectionListContainer: CollectionListContainerNode private let collectionListContainer: ASDisplayNode
private let blurView: UIView private let blurView: UIView
@ -131,7 +131,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
self.collectionListPanel.backgroundColor = UIColor(rgb: 0x151515) self.collectionListPanel.backgroundColor = UIColor(rgb: 0x151515)
self.collectionListPanel.alpha = 0.3 self.collectionListPanel.alpha = 0.3
self.collectionListContainer = CollectionListContainerNode() self.collectionListContainer = ASDisplayNode()
self.collectionListContainer.clipsToBounds = true self.collectionListContainer.clipsToBounds = true
self.listView = ListView() self.listView = ListView()
@ -822,12 +822,14 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
func animateIn() { func animateIn() {
self.isUserInteractionEnabled = true self.isUserInteractionEnabled = true
self.isHidden = false self.isHidden = false
self.insertSubnode(self.stickerPane, belowSubnode: self.collectionListContainer)
self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
} }
func animateOut() { func animateOut() {
self.isUserInteractionEnabled = false self.isUserInteractionEnabled = false
self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { [weak self] _ in self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { [weak self] _ in
self?.stickerPane.removeFromSupernode()
self?.isHidden = true self?.isHidden = true
}) })
} }
@ -926,10 +928,6 @@ final class DrawingStickersScreen: ViewController, TGPhotoPaintStickersScreen {
} }
} }
// override public func inFocusUpdated(isInFocus: Bool) {
// self.controllerNode.inFocusUpdated(isInFocus: isInFocus)
// }
override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
super.containerLayoutUpdated(layout, transition: transition) super.containerLayoutUpdated(layout, transition: transition)