FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatically show the nav and toolbars when separating controllers. Issue #1593

This commit is contained in:
Maurice Parker 2020-01-09 21:22:29 -07:00
parent 1b1b3e796e
commit f1e01bd43f
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iOS/Article/WebViewController.swift
View File

@ -227,15 +227,13 @@ class WebViewController: UIViewController {
} }
func showBars() { func showBars() {
if isFullScreenAvailable { AppDefaults.articleFullscreenEnabled = false
AppDefaults.articleFullscreenEnabled = false coordinator.showStatusBar()
coordinator.showStatusBar() topShowBarsViewConstraint?.constant = 0
topShowBarsViewConstraint?.constant = 0 bottomShowBarsViewConstraint?.constant = 0
bottomShowBarsViewConstraint?.constant = 0 navigationController?.setNavigationBarHidden(false, animated: true)
navigationController?.setNavigationBarHidden(false, animated: true) navigationController?.setToolbarHidden(false, animated: true)
navigationController?.setToolbarHidden(false, animated: true) configureContextMenuInteraction()
configureContextMenuInteraction()
}
} }
func hideBars() { func hideBars() {

1
iOS/SceneCoordinator.swift
View File

@ -1102,6 +1102,7 @@ extension SceneCoordinator: UISplitViewControllerDelegate {
} }
if let articleViewController = masterNavigationController.viewControllers.last as? ArticleViewController { if let articleViewController = masterNavigationController.viewControllers.last as? ArticleViewController {
articleViewController.showBars(self)
masterNavigationController.popViewController(animated: false) masterNavigationController.popViewController(animated: false)
let controller = addNavControllerIfNecessary(articleViewController, showButton: true) let controller = addNavControllerIfNecessary(articleViewController, showButton: true)
return controller return controller