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

Fix #547 by implementing state restoration in the sidebar and timeline view controllers.

Browse Source
This commit is contained in:
Daniel Jalkut 2019-02-15 13:38:07 -05:00
parent cd695848f0
commit c54d2f94cc
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NetNewsWire/MainWindow/MainWindowController.swift
View File

@ -78,11 +78,17 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations, NSW
// MARK: - Notifications // MARK: - Notifications
func window(_ window: NSWindow, willEncodeRestorableState state: NSCoder) { func window(_ window: NSWindow, willEncodeRestorableState state: NSCoder) {
saveSplitViewState(to: state) saveSplitViewState(to: state)
} }
func window(_ window: NSWindow, didDecodeRestorableState state: NSCoder) { func window(_ window: NSWindow, didDecodeRestorableState state: NSCoder) {
restoreSplitViewState(from: state) restoreSplitViewState(from: state)
// Make sure the timeline view is first responder if possible, to start out viewing
// whatever preserved selection might have been restored
makeTimelineViewFirstResponder()
} }
@objc func refreshProgressDidChange(_ note: Notification) { @objc func refreshProgressDidChange(_ note: Notification) {

22
NetNewsWire/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -70,6 +70,26 @@ import RSCore
} }
} }
// MARK: State Restoration
private static let stateRestorationSelectedRowIndexes = "selectedRowIndexes"
override func encodeRestorableState(with coder: NSCoder) {
super.encodeRestorableState(with: coder)
coder.encode(outlineView.selectedRowIndexes, forKey: SidebarViewController.stateRestorationSelectedRowIndexes)
}
override func restoreState(with coder: NSCoder) {
super.restoreState(with: coder)
if let restoredRowIndexes = coder.decodeObject(of: [NSIndexSet.self], forKey: SidebarViewController.stateRestorationSelectedRowIndexes) as? IndexSet {
outlineView.selectRowIndexes(restoredRowIndexes, byExtendingSelection: false)
}
}
// MARK: - Notifications // MARK: - Notifications
@objc func unreadCountDidChange(_ note: Notification) { @objc func unreadCountDidChange(_ note: Notification) {
@ -278,6 +298,8 @@ import RSCore
func outlineViewSelectionDidChange(_ notification: Notification) { func outlineViewSelectionDidChange(_ notification: Notification) {
postSidebarSelectionDidChangeNotification(selectedObjects.isEmpty ? nil : selectedObjects) postSidebarSelectionDidChangeNotification(selectedObjects.isEmpty ? nil : selectedObjects)
self.invalidateRestorableState()
} }
//MARK: - Node Manipulation //MARK: - Node Manipulation

22
NetNewsWire/MainWindow/Timeline/TimelineViewController.swift
View File

@ -143,6 +143,26 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
sharingServiceDelegate = SharingServiceDelegate(self.view.window) sharingServiceDelegate = SharingServiceDelegate(self.view.window)
} }
// MARK: State Restoration
private static let stateRestorationSelectedArticles = "selectedArticles"
override func encodeRestorableState(with coder: NSCoder) {
super.encodeRestorableState(with: coder)
coder.encode(self.selectedArticleIDs(), forKey: TimelineViewController.stateRestorationSelectedArticles)
}
override func restoreState(with coder: NSCoder) {
super.restoreState(with: coder)
if let restoredArticleIDs = (try? coder.decodeTopLevelObject(forKey: TimelineViewController.stateRestorationSelectedArticles)) as? [String] {
self.restoreSelection(restoredArticleIDs)
}
}
// MARK: Appearance Change // MARK: Appearance Change
private func fontSizeDidChange() { private func fontSizeDidChange() {
@ -618,6 +638,8 @@ extension TimelineViewController: NSTableViewDelegate {
} }
postTimelineSelectionDidChangeNotification(selectedArticles) postTimelineSelectionDidChangeNotification(selectedArticles)
self.invalidateRestorableState()
} }
private func postTimelineSelectionDidChangeNotification(_ selectedArticles: ArticleArray?) { private func postTimelineSelectionDidChangeNotification(_ selectedArticles: ArticleArray?) {