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

Made title window title work for PseudoFeeds. Issue #48

Browse Source
This commit is contained in:
Maurice Parker 2018-09-19 11:15:04 -05:00
parent 5fc1ce4389
commit cef22fc9e7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
NetNewsWire/MainWindow/MainWindowController.swift
View File

@ -102,12 +102,14 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
@objc func sidebarSelectionDidChange(_ note: Notification) { @objc func sidebarSelectionDidChange(_ note: Notification) {
let selectedObjects = selectedObjectsInSidebar() let selectedObjects = selectedObjectsInSidebar()
// We can only meaninfully display one feed or folder at a time
guard selectedObjects?.count == 1 else { guard selectedObjects?.count == 1 else {
currentFeedOrFolder = nil currentFeedOrFolder = nil
return return
} }
guard selectedObjects?[0] is DisplayNameProvider && selectedObjects?[0] is UnreadCountProvider else { guard selectedObjects?[0] is DisplayNameProvider else {
currentFeedOrFolder = nil currentFeedOrFolder = nil
return return
} }
@ -124,22 +126,31 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
updateWindowTitleIfNecessary(note.object) updateWindowTitleIfNecessary(note.object)
} }
private func updateWindowTitleIfNecessary(_ object: Any?) { private func updateWindowTitleIfNecessary(_ noteObject: Any?) {
if let folder = currentFeedOrFolder as? Folder, let noteObject = object as? Folder { if let folder = currentFeedOrFolder as? Folder, let noteObject = noteObject as? Folder {
if folder == noteObject { if folder == noteObject {
updateWindowTitle() updateWindowTitle()
return return
} }
} }
if let feed = currentFeedOrFolder as? Feed, let noteObject = object as? Feed { if let feed = currentFeedOrFolder as? Feed, let noteObject = noteObject as? Feed {
if feed == noteObject { if feed == noteObject {
updateWindowTitle() updateWindowTitle()
return return
} }
} }
// If we don't recognize the changed object, we will test it for identity instead
// of equality. This works well for us if the window display is displaying a
// PsuedoFeed object.
if let currentObject = currentFeedOrFolder, let noteObject = noteObject {
if currentObject === noteObject as AnyObject {
updateWindowTitle()
}
}
} }
// MARK: - Toolbar // MARK: - Toolbar