FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-25 00:15:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep table selections when root split isn't collapsed

Browse Source
This commit is contained in:
Maurice Parker 2019-08-02 10:25:47 -05:00
parent 52055d83f5
commit 54f6607621
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/AppCoordinator.swift
View File

@ -67,6 +67,10 @@ class AppCoordinator: NSObject, UndoableCommandRunner {
return TreeController(delegate: treeControllerDelegate) return TreeController(delegate: treeControllerDelegate)
}() }()
var isRootSplitCollapsed: Bool {
return rootSplitViewController.isCollapsed
}
var isThreePanelMode: Bool { var isThreePanelMode: Bool {
return rootSplitViewController.traitCollection.userInterfaceIdiom == .pad && rootSplitViewController.displayMode == .allVisible return rootSplitViewController.traitCollection.userInterfaceIdiom == .pad && rootSplitViewController.displayMode == .allVisible
} }

2
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -53,8 +53,8 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
clearsSelectionOnViewWillAppear = true
navigationController?.title = NSLocalizedString("Feeds", comment: "Feeds") navigationController?.title = NSLocalizedString("Feeds", comment: "Feeds")
clearsSelectionOnViewWillAppear = coordinator.isRootSplitCollapsed
super.viewWillAppear(animated) super.viewWillAppear(animated)
} }

5
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -54,6 +54,11 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
} }
override func viewWillAppear(_ animated: Bool) {
clearsSelectionOnViewWillAppear = coordinator.isRootSplitCollapsed
super.viewWillAppear(animated)
}
override func viewDidAppear(_ animated: Bool) { override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
becomeFirstResponder() becomeFirstResponder()