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

Update the title bar when searching

Browse Source
This commit is contained in:
Maurice Parker 2020-11-19 16:21:51 -06:00
parent bc7692f4ba
commit 04736ded79
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Mac/MainWindow/MainWindowController.swift
View File

@ -642,6 +642,7 @@ extension MainWindowController: NSSearchFieldDelegate {
let smartFeed = SmartFeed(delegate: SearchFeedDelegate(searchString: searchString)) let smartFeed = SmartFeed(delegate: SearchFeedDelegate(searchString: searchString))
timelineContainerViewController?.setRepresentedObjects([smartFeed], mode: .search) timelineContainerViewController?.setRepresentedObjects([smartFeed], mode: .search)
searchSmartFeed = smartFeed searchSmartFeed = smartFeed
updateWindowTitle()
} }
func forceSearchToEnd() { func forceSearchToEnd() {
@ -651,10 +652,12 @@ extension MainWindowController: NSSearchFieldDelegate {
if let searchField = currentSearchField { if let searchField = currentSearchField {
searchField.stringValue = "" searchField.stringValue = ""
} }
updateWindowTitle()
} }
private func startSearchingIfNeeded() { private func startSearchingIfNeeded() {
timelineSourceMode = .search timelineSourceMode = .search
updateWindowTitle()
} }
private func stopSearchingIfNeeded() { private func stopSearchingIfNeeded() {
@ -662,6 +665,7 @@ extension MainWindowController: NSSearchFieldDelegate {
lastSentSearchString = nil lastSentSearchString = nil
timelineSourceMode = .regular timelineSourceMode = .regular
timelineContainerViewController?.setRepresentedObjects(nil, mode: .search) timelineContainerViewController?.setRepresentedObjects(nil, mode: .search)
updateWindowTitle()
} }
} }
@ -1234,6 +1238,15 @@ private extension MainWindowController {
} }
func updateWindowTitle() { func updateWindowTitle() {
guard timelineSourceMode != .search else {
let localizedLabel = NSLocalizedString("Search: %@", comment: "Search")
window?.title = NSString.localizedStringWithFormat(localizedLabel as NSString, searchString ?? "") as String
if #available(macOS 11.0, *) {
window?.subtitle = ""
}
return
}
func setSubtitle(_ count: Int) { func setSubtitle(_ count: Int) {
let localizedLabel = NSLocalizedString("%d unread", comment: "Unread") let localizedLabel = NSLocalizedString("%d unread", comment: "Unread")
let formattedLabel = NSString.localizedStringWithFormat(localizedLabel as NSString, count) let formattedLabel = NSString.localizedStringWithFormat(localizedLabel as NSString, count)