New window handling

Author: marshallino16

Snip.xcodeproj/project.pbxproj

@@ -710,7 +710,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Snip/Preview Content\"";
 				DEVELOPMENT_TEAM = 7XBGRFP286;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -737,7 +737,7 @@
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Snip/Preview Content\"";
 				DEVELOPMENT_TEAM = 7XBGRFP286;
 				ENABLE_HARDENED_RUNTIME = YES;

Snip/AppDelegate.swift

@@ -13,13 +13,29 @@ import Combine
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
+  lazy var windows = NSWindow()
   var window: NSWindow!
 
   func applicationDidFinishLaunching(_ aNotification: Notification) {
 
     SyncManager.shared.initialize()
 
-    let contentView = SnipViewApp()
+    createWindow()
+  }
+  
+  func applicationWillTerminate(_ aNotification: Notification) {
+  }
+  
+  func application(_ application: NSApplication, open urls: [URL]) {
+    SyncManager.shared.handleDeepLink(urls: urls)
+  }
+  
+  
+  // Window
+  
+  func createWindow() {
+    
+    let snipAppView = SnipViewApp()
       .environmentObject(Settings())
       .environmentObject(AppState())
       .edgesIgnoringSafeArea(.top)
@@ -35,18 +51,26 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     window.isMovableByWindowBackground = true
     window.center()
     window.setFrameAutosaveName("Main Window")
-    window.contentView = NSHostingView(rootView: contentView)
+    window.contentView = NSHostingView(rootView: snipAppView)
+    window.isReleasedWhenClosed = false
     DispatchQueue.main.async {
       self.window.orderOut(nil)
       self.window.makeKeyAndOrderFront(nil)
     }
   }
 
-  func applicationWillTerminate(_ aNotification: Notification) {
+  func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+    if !flag {
+        sender.windows.forEach { $0.makeKeyAndOrderFront(self) }
+    }
+    return true
   }
 
-  func application(_ application: NSApplication, open urls: [URL]) {
-    SyncManager.shared.handleDeepLink(urls: urls)
+  
+  // Menu
+  
+  @IBAction func newWindow(_ sender: Any) {
+    window.makeKeyAndOrderFront(self)
   }
 }