|
|
@@ -8,11 +8,28 @@ import Cocoa
|
|
8
|
8
|
@main
|
|
9
|
9
|
class AppDelegate: NSObject, NSApplicationDelegate {
|
|
10
|
10
|
|
|
|
11
|
+ private weak var mainWindowController: MainWindowController?
|
|
|
12
|
+
|
|
11
|
13
|
func applicationDidFinishLaunching(_ notification: Notification) {
|
|
|
14
|
+ resolveMainWindowController()
|
|
12
|
15
|
configureMainWindow()
|
|
13
|
16
|
NSApp.activate(ignoringOtherApps: true)
|
|
14
|
17
|
}
|
|
15
|
18
|
|
|
|
19
|
+ func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
|
|
20
|
+ false
|
|
|
21
|
+ }
|
|
|
22
|
+
|
|
|
23
|
+ func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
|
|
|
24
|
+ if !flag {
|
|
|
25
|
+ resolveMainWindowController()
|
|
|
26
|
+ mainWindowController?.showWindow(self)
|
|
|
27
|
+ mainWindowController?.window?.makeKeyAndOrderFront(self)
|
|
|
28
|
+ NSApp.activate(ignoringOtherApps: true)
|
|
|
29
|
+ }
|
|
|
30
|
+ return true
|
|
|
31
|
+ }
|
|
|
32
|
+
|
|
16
|
33
|
func applicationShouldRestoreApplicationState(_ app: NSApplication) -> Bool {
|
|
17
|
34
|
false
|
|
18
|
35
|
}
|
|
|
@@ -58,11 +75,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|
58
|
75
|
}
|
|
59
|
76
|
|
|
60
|
77
|
private var mainWindow: NSWindow? {
|
|
61
|
|
- NSApplication.shared.mainWindow
|
|
62
|
|
- ?? NSApplication.shared.keyWindow
|
|
|
78
|
+ mainWindowController?.window
|
|
63
|
79
|
?? NSApplication.shared.windows.first(where: \.canBecomeMain)
|
|
64
|
80
|
}
|
|
65
|
81
|
|
|
|
82
|
+ private func resolveMainWindowController() {
|
|
|
83
|
+ guard mainWindowController == nil else { return }
|
|
|
84
|
+
|
|
|
85
|
+ mainWindowController = NSApplication.shared.windows
|
|
|
86
|
+ .compactMap { $0.windowController as? MainWindowController }
|
|
|
87
|
+ .first
|
|
|
88
|
+
|
|
|
89
|
+ if mainWindowController == nil {
|
|
|
90
|
+ DispatchQueue.main.async { [weak self] in
|
|
|
91
|
+ self?.resolveMainWindowController()
|
|
|
92
|
+ }
|
|
|
93
|
+ }
|
|
|
94
|
+ }
|
|
|
95
|
+
|
|
66
|
96
|
func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
|
|
67
|
97
|
true
|
|
68
|
98
|
}
|