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

Send Notification when mainWindow will close — remove use of appDelegate property.

Browse Source
This commit is contained in:
Brent Simmons 2025-01-30 21:27:27 -08:00
parent 6e82063aa9
commit 658dbc33ac
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Mac/AppDelegate.swift
View File

@ -110,6 +110,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(importDownloadedTheme(_:)), name: .didEndDownloadingTheme, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(themeImportError(_:)), name: .didFailToImportThemeWithError, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(mainWindowWillClose(_:)), name: .mainWindowControllerWillClose, object: nil)
NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(didWakeNotification(_:)), name: NSWorkspace.didWakeNotification, object: nil)
appDelegate = self
@ -297,7 +298,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
while !isShutDownSyncDone && RunLoop.current.run(mode: .default, before: timeout) && timeout > Date() { }
}
// MARK: Notifications
// MARK: - Notifications
@objc func unreadCountDidChange(_ note: Notification) {
if note.object is AccountManager {
unreadCount = AccountManager.shared.unreadCount
@ -346,6 +348,14 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
}
}
@objc func mainWindowWillClose(_ note: Notification) {
guard let mainWindowController = note.object as? MainWindowController else {
return
}
removeMainWindowController(mainWindowController)
}
// MARK: Main Window
func createMainWindowController() -> MainWindowController {
@ -384,7 +394,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
}
}
func removeMainWindow(_ windowController: MainWindowController) {
func removeMainWindowController(_ windowController: MainWindowController) {
guard mainWindowControllers.count > 1 else { return }
if let index = mainWindowControllers.firstIndex(of: windowController) {
mainWindowControllers.remove(at: index)

8
Mac/MainWindow/MainWindowController.swift
View File

@ -12,6 +12,10 @@ import Articles
import Account
import RSCore
extension Notification.Name {
static let mainWindowControllerWillClose = Notification.Name("mainWindowControllerWillClose")
}
enum TimelineSourceMode {
case regular, search
}
@ -524,6 +528,7 @@ final class MainWindowController: NSWindowController, NSUserInterfaceValidations
// MARK: NSWindowDelegate
extension MainWindowController: NSWindowDelegate {
func window(_ window: NSWindow, willEncodeRestorableState coder: NSCoder) {
@ -537,9 +542,8 @@ extension MainWindowController: NSWindowDelegate {
func windowWillClose(_ notification: Notification) {
detailViewController?.stopMediaPlayback()
appDelegate.removeMainWindow(self)
NotificationCenter.default.post(name: .mainWindowControllerWillClose, object: self)
}
}
// MARK: - SidebarDelegate