FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the sidebar filter state preservation.

Browse Source
This commit is contained in:
Maurice Parker 2020-03-02 17:55:36 -08:00
parent eaa99db5c7
commit b6ff9e8ff4
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mac/MainWindow/MainWindowController.swift
View File

@ -449,18 +449,11 @@ extension MainWindowController: NSWindowDelegate {
func window(_ window: NSWindow, willEncodeRestorableState state: NSCoder) { func window(_ window: NSWindow, willEncodeRestorableState state: NSCoder) {
if let sidebarReadFiltered = sidebarViewController?.isReadFiltered {
state.encode(sidebarReadFiltered, forKey: UserInfoKey.readFeedsFilterState)
}
// saveSplitViewState(to: state) // saveSplitViewState(to: state)
} }
func window(_ window: NSWindow, didDecodeRestorableState state: NSCoder) { func window(_ window: NSWindow, didDecodeRestorableState state: NSCoder) {
let sidebarReadFiltered = state.decodeBool(forKey: UserInfoKey.readFeedsFilterState)
sidebarViewController?.isReadFiltered = sidebarReadFiltered
// restoreSplitViewState(from: state) // restoreSplitViewState(from: state)
// //
// // Make sure the timeline view is first responder if possible, to start out viewing // // Make sure the timeline view is first responder if possible, to start out viewing
@ -499,10 +492,6 @@ extension MainWindowController: SidebarDelegate {
return timelineViewController.unreadCount return timelineViewController.unreadCount
} }
func sidebarInvalidateRestorableState(_: SidebarViewController) {
invalidateRestorableState()
}
} }
// MARK: - TimelineContainerViewControllerDelegate // MARK: - TimelineContainerViewControllerDelegate

13
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -15,7 +15,6 @@ import RSCore
protocol SidebarDelegate: class { protocol SidebarDelegate: class {
func sidebarSelectionDidChange(_: SidebarViewController, selectedObjects: [AnyObject]?) func sidebarSelectionDidChange(_: SidebarViewController, selectedObjects: [AnyObject]?)
func unreadCount(for: AnyObject) -> Int func unreadCount(for: AnyObject) -> Int
func sidebarInvalidateRestorableState(_: SidebarViewController)
} }
@objc class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSOutlineViewDataSource, NSMenuDelegate, UndoableCommandRunner { @objc class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSOutlineViewDataSource, NSMenuDelegate, UndoableCommandRunner {
@ -39,7 +38,7 @@ protocol SidebarDelegate: class {
} }
set { set {
treeControllerDelegate.isReadFiltered = newValue treeControllerDelegate.isReadFiltered = newValue
delegate?.sidebarInvalidateRestorableState(self) invalidateRestorableState()
rebuildTreeAndRestoreSelection() rebuildTreeAndRestoreSelection()
} }
} }
@ -92,6 +91,16 @@ protocol SidebarDelegate: class {
} }
} }
// MARK: State Restoration
override func encodeRestorableState(with coder: NSCoder) {
coder.encode(isReadFiltered, forKey: UserInfoKey.readFeedsFilterState)
}
override func restoreState(with coder: NSCoder) {
isReadFiltered = coder.decodeBool(forKey: UserInfoKey.readFeedsFilterState)
}
// MARK: - Notifications // MARK: - Notifications
@objc func unreadCountDidChange(_ note: Notification) { @objc func unreadCountDidChange(_ note: Notification) {