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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-02-20 04:30:51 +04:00
parent b529625219
commit 980a2c47bc
25 changed files with 262 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
submodules/Display/Source/Navigation/NavigationController.swift
View File

@@ -1354,10 +1354,24 @@ open class NavigationController: UINavigationController, ContainableController,
public func replaceControllersAndPush(controllers: [UIViewController], controller: ViewController, animated: Bool, options: NavigationAnimationOptions = [], ready: ValuePromise<Bool>? = nil, completion: @escaping () -> Void = {}) {
ready?.set(true)
var controllers = controllers
controllers.append(controller)
self.setViewControllers(controllers, animated: animated)
completion()
let action = { [weak self] in
guard let self else {
return
}
var controllers = controllers
controllers.append(controller)
self.setViewControllers(controllers, animated: animated)
completion()
}
if let rootContainer = self.rootContainer, case let .split(container) = rootContainer, let topController = container.detailControllers.last {
if topController.attemptNavigation({
action()
}) {
action()
}
} else {
action()
}
}
public func replaceControllers(controllers: [UIViewController], animated: Bool, options: NavigationAnimationOptions = [], ready: ValuePromise<Bool>? = nil, completion: @escaping () -> Void = {}) {

2
submodules/Display/Source/TextNode.swift
View File

@@ -1654,7 +1654,7 @@ open class TextNode: ASDisplayNode {
return (layout, {
node.cachedLayout = layout
if updated {
if layout.size.width.isZero && layout.size.height.isZero {
if layout.size.width.isZero || layout.size.height.isZero {
node.contents = nil
}
node.setNeedsDisplay()