renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create a private shared property for use in window restoration.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-30 21:45:17 -08:00
parent 658dbc33ac
commit 9e3b659710
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Mac/AppDelegate.swift
View File

@@ -19,7 +19,7 @@ import OSLog
import CrashReporter
import Sparkle
var appDelegate: AppDelegate!
//var appDelegate: AppDelegate!
@NSApplicationMain
final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, UNUserNotificationCenterDelegate, UnreadCountProvider, SPUStandardUserDriverDelegate, SPUUpdaterDelegate {
@@ -95,6 +95,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
private var themeImportPath: String?
private static var shared: AppDelegate?
override init() {
NSWindow.allowsAutomaticWindowTabbing = false
super.init()
@@ -113,7 +115,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat
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
Self.shared = self
}
// MARK: - API
@@ -905,11 +907,14 @@ extension AppDelegate: NSWindowRestoration {
@objc static func restoreWindow(withIdentifier identifier: NSUserInterfaceItemIdentifier, state: NSCoder, completionHandler: @escaping (NSWindow?, Error?) -> Void) {
var mainWindow: NSWindow?
if identifier.rawValue == WindowRestorationIdentifiers.mainWindow {
mainWindow = appDelegate.createAndShowMainWindow().window
if let shared {
mainWindow = shared.createAndShowMainWindow().window
} else {
assertionFailure("Expected shared instance of AppDelegate to exist during window restoration.")
}
}
completionHandler(mainWindow, nil)
}
}
// Handle Notification Actions