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

Hook up new search toolbar item

Browse Source
This commit is contained in:
Maurice Parker 2020-08-09 16:40:44 -05:00
parent 656d327692
commit 8ee33c34b3
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mac/MainWindow/MainWindowController.swift
View File

@ -764,6 +764,14 @@ extension MainWindowController: NSToolbarDelegate {
button.sendAction(on: .leftMouseDown) button.sendAction(on: .leftMouseDown)
} }
if #available(macOS 10.16, *) {
if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
searchItem.searchField.delegate = self
searchItem.searchField.target = self
searchItem.searchField.action = #selector(runSearch(_:))
currentSearchField = searchItem.searchField
}
} else {
if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField { if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField {
searchField.delegate = self searchField.delegate = self
searchField.target = self searchField.target = self
@ -771,12 +779,21 @@ extension MainWindowController: NSToolbarDelegate {
currentSearchField = searchField currentSearchField = searchField
} }
} }
}
func toolbarDidRemoveItem(_ notification: Notification) { func toolbarDidRemoveItem(_ notification: Notification) {
guard let item = notification.userInfo?["item"] as? NSToolbarItem else { guard let item = notification.userInfo?["item"] as? NSToolbarItem else {
return return
} }
if #available(macOS 10.16, *) {
if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
searchItem.searchField.delegate = nil
searchItem.searchField.target = nil
searchItem.searchField.action = nil
currentSearchField = nil
}
} else {
if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField { if item.itemIdentifier == .search, let searchField = item.view as? NSSearchField {
searchField.delegate = nil searchField.delegate = nil
searchField.target = nil searchField.target = nil
@ -786,6 +803,8 @@ extension MainWindowController: NSToolbarDelegate {
} }
} }
}
// MARK: - Private // MARK: - Private
private extension MainWindowController { private extension MainWindowController {