Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when split VC collapses with multi-column nav controller

This commit is contained in:
Shadowfacts 2023-09-05 20:47:11 -04:00
parent 88105f22a0
commit f1a6a405c2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tusker/Screens/Main/MainSplitViewController.swift
View File

@ -169,6 +169,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
var itemNavStack: [UIViewController] var itemNavStack: [UIViewController]
if item == sidebar.selectedItem { if item == sidebar.selectedItem {
itemNavStack = secondaryNavController.viewControllers itemNavStack = secondaryNavController.viewControllers
secondaryNavController.viewControllers = []
} else { } else {
itemNavStack = navigationStacks[item] ?? [] itemNavStack = navigationStacks[item] ?? []
navigationStacks.removeValue(forKey: item) navigationStacks.removeValue(forKey: item)

6
Tusker/Screens/Utilities/MultiColumnNavigationController.swift
View File

@ -121,8 +121,12 @@ class MultiColumnNavigationController: UIViewController {
} }
private func scrollToEnd(animated: Bool) { private func scrollToEnd(animated: Bool) {
if viewControllers.isEmpty {
scrollView.setContentOffset(.init(x: -scrollView.adjustedLeadingContentInset, y: -scrollView.adjustedContentInset.top), animated: false)
} else {
scrollColumnToEnd(columnIndex: viewControllers.count - 1, animated: animated) scrollColumnToEnd(columnIndex: viewControllers.count - 1, animated: animated)
} }
}
private func scrollColumnToEnd(columnIndex: Int, animated: Bool) { private func scrollColumnToEnd(columnIndex: Int, animated: Bool) {
scrollView.layoutIfNeeded() scrollView.layoutIfNeeded()
@ -233,7 +237,7 @@ private class ColumnView: UIView {
} }
func setContent(_ viewController: UIViewController, needsCloseButton: Bool) { func setContent(_ viewController: UIViewController, needsCloseButton: Bool) {
guard viewController !== contentViewController else { guard viewController !== contentViewController || viewController.parent !== navigationController else {
return return
} }