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

Merge branch 'master' into bazel

Browse Source
This commit is contained in:
Ali
2020-02-19 15:37:48 +04:00
parent c274acfe07 7e857af95f
commit 4140b000e1
49 changed files with 2020 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/Display/Source/TabBarController.swift
View File

@@ -269,6 +269,7 @@ open class TabBarController: ViewController {
currentController.navigationItem.setTarget(self.navigationItem)
displayNavigationBar = currentController.displayNavigationBar
self.navigationBar?.setContentNode(currentController.navigationBar?.contentNode, animated: false)
self.navigationBar?.setSecondaryContentNode(currentController.navigationBar?.secondaryContentNode)
currentController.displayNode.recursivelyEnsureDisplaySynchronously(true)
self.statusBar.statusBarStyle = currentController.statusBar.statusBarStyle
} else {
@@ -278,14 +279,21 @@ open class TabBarController: ViewController {
self.navigationItem.titleView = nil
self.navigationItem.backBarButtonItem = nil
self.navigationBar?.setContentNode(nil, animated: false)
self.navigationBar?.setSecondaryContentNode(nil)
displayNavigationBar = false
}
if self.displayNavigationBar != displayNavigationBar {
self.setDisplayNavigationBar(displayNavigationBar)
}
if let validLayout = self.validLayout {
self.containerLayoutUpdated(validLayout, transition: .immediate)
if let layout = self.validLayout {
self.containerLayoutUpdated(layout, transition: .immediate)
}
}
public func updateLayout() {
if let layout = self.validLayout {
self.containerLayoutUpdated(layout, transition: .immediate)
}
}