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

Video editor fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-05-29 13:51:58 +03:00
parent 5dadaeb29e
commit d0b4ba6f7e
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
private let stickerListView: ListView
private let maskListView: ListView
private var hiddenListView: ListView?
private var searchContainerNode: PaneSearchContainerNode?
private let searchContainerNodeLoadedDisposable = MetaDisposable()
@@ -293,8 +294,8 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
}
}
}
}, openPeerSpecificSettings: { [weak self] in
}, dismissPeerSpecificSettings: { [weak self] in
}, openPeerSpecificSettings: {
}, dismissPeerSpecificSettings: {
}, clearRecentlyUsedStickers: { [weak self] in
if let strongSelf = self {
let actionSheet = ActionSheetController(theme: ActionSheetControllerTheme(presentationTheme: strongSelf.presentationData.theme, fontSize: strongSelf.presentationData.listsFontSize))
@@ -410,8 +411,8 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
}
}
}
}, openPeerSpecificSettings: { [weak self] in
}, dismissPeerSpecificSettings: { [weak self] in
}, openPeerSpecificSettings: {
}, dismissPeerSpecificSettings: {
}, clearRecentlyUsedStickers: { [weak self] in
if let strongSelf = self {
let actionSheet = ActionSheetController(theme: ActionSheetControllerTheme(presentationTheme: strongSelf.presentationData.theme, fontSize: strongSelf.presentationData.listsFontSize))
@@ -1274,6 +1275,11 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
if let hiddenPane = self.hiddenPane {
self.insertSubnode(hiddenPane, belowSubnode: self.collectionListContainer)
self.hiddenPane = nil
}
if let hiddenListView = self.hiddenListView {
self.collectionListContainer.addSubnode(hiddenListView)
self.hiddenListView = nil
}
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, completion: { [weak self] _ in
@@ -1291,10 +1297,13 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
if let strongSelf = self {
if strongSelf.stickerPane.supernode != nil {
strongSelf.hiddenPane = strongSelf.stickerPane
strongSelf.hiddenListView = strongSelf.stickerListView
} else if strongSelf.maskPane.supernode != nil {
strongSelf.hiddenPane = strongSelf.maskPane
strongSelf.hiddenListView = strongSelf.maskListView
}
strongSelf.hiddenPane?.removeFromSupernode()
strongSelf.hiddenListView?.removeFromSupernode()
strongSelf.isHidden = true
}
})