Merge branches 'master' and 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2020-12-04 12:23:12 +04:00
6 changed files with 23 additions and 182 deletions

View File

@@ -643,6 +643,8 @@ open class NavigationController: UINavigationController, ContainableController,
visibleModalCount = 0
}
if previousModalContainer == nil {
topModalIsFlat = modalContainer.isFlat
topModalDismissProgress = modalContainer.dismissProgress
if case .compact = layout.metrics.widthClass {
modalContainer.keyboardViewManager = self.keyboardViewManager
@@ -665,8 +667,6 @@ open class NavigationController: UINavigationController, ContainableController,
}
}
}
topModalIsFlat = modalContainer.isFlat
}
switch navigationLayout.root {