finished general tab in settings + app icon

Author: EllandeVED

NumWorksMac/App/AppController.swift

@@ -8,6 +8,7 @@ final class AppController: NSObject, NSWindowDelegate {
     let windowManagement = WindowManagement()
     private var menuBarController: MenuBarController?
     private var cancellables = Set<AnyCancellable>()
+    private var settingsWindowOpen = false
 
     private var suppressFrameSaves = false
     private let windowFrameDefaultsKey = "MainWindowFrame"
@@ -23,21 +24,12 @@ final class AppController: NSObject, NSWindowDelegate {
     }
 
     private func applyDockIconVisibility() {
-        let show = Preferences.shared.showDockIcon
+        let show = settingsWindowOpen ? true : Preferences.shared.showDockIcon
         let policy: NSApplication.ActivationPolicy = show ? .regular : .accessory
 
         if NSApp.activationPolicy() != policy {
             _ = NSApp.setActivationPolicy(policy)
         }
-
-        if Preferences.shared.isAppVisible {
-            windowManagement.show()
-            if Preferences.shared.isPinned {
-                windowManagement.setPinned(true)
-            }
-        }
-
-        NSApp.activate(ignoringOtherApps: true)
     }
 
     func start() {
@@ -78,6 +70,22 @@ final class AppController: NSObject, NSWindowDelegate {
             }
             .store(in: &cancellables)
 
+        NotificationCenter.default.publisher(for: .settingsWindowDidAppear)
+            .receive(on: RunLoop.main)
+            .sink { [weak self] _ in
+                self?.settingsWindowOpen = true
+                self?.applyDockIconVisibility()
+            }
+            .store(in: &cancellables)
+
+        NotificationCenter.default.publisher(for: .settingsWindowDidDisappear)
+            .receive(on: RunLoop.main)
+            .sink { [weak self] _ in
+                self?.settingsWindowOpen = false
+                self?.applyDockIconVisibility()
+            }
+            .store(in: &cancellables)
+
         NotificationCenter.default.publisher(for: NSWindow.didChangeOcclusionStateNotification, object: windowManagement.nsWindow)
             .sink { [weak self] _ in
                 guard let self else { return }

NumWorksMac/App/NumWorksMacApp.swift

@@ -8,6 +8,7 @@ struct NumWorksMacApp: App {
         Settings {
             SettingsView()
         }
+        .defaultSize(width: 520, height: 420)
         .commands {
             CommandGroup(replacing: .appSettings) {
                 SettingsLink {

NumWorksMac/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_16x16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "icon_16x16@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "icon_32x32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "icon_32x32@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "icon_128x128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "icon_128x128@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "icon_256x256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "icon_256x256@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "icon_512x512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "icon_512x512@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}