Merge pull request #62 from Gabko14/fix/window-stays-open-when-pinned

fix: keep window open when pinned

Author: Gabko14

Ghostly.xcodeproj/project.pbxproj

@@ -270,7 +270,7 @@
 			mainGroup = C836C54C25A0171500BEB83F;
 			packageReferences = (
 				KBSH000525E0000000000005 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */,
-				MBEA000225E0000000000002 /* XCRemoteSwiftPackageReference "MenuBarExtraAccess" */,
+				MBEA000225E0000000000002 /* XCLocalSwiftPackageReference "LocalPackages/MenuBarExtraAccess" */,
 			);
 			productRefGroup = C836C55625A0171500BEB83F /* Products */;
 			projectDirPath = "";
@@ -609,16 +609,15 @@
 				minimumVersion = 2.0.0;
 			};
 		};
-		MBEA000225E0000000000002 /* XCRemoteSwiftPackageReference "MenuBarExtraAccess" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/orchetect/MenuBarExtraAccess";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		MBEA000225E0000000000002 /* XCLocalSwiftPackageReference "LocalPackages/MenuBarExtraAccess" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = LocalPackages/MenuBarExtraAccess;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		KBSH000025E0000000000000 /* KeyboardShortcuts */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -632,7 +631,7 @@
 		};
 		MBEA000025E0000000000000 /* MenuBarExtraAccess */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = MBEA000225E0000000000002 /* XCRemoteSwiftPackageReference "MenuBarExtraAccess" */;
+			package = MBEA000225E0000000000002 /* XCLocalSwiftPackageReference "LocalPackages/MenuBarExtraAccess" */;
 			productName = MenuBarExtraAccess;
 		};
 /* End XCSwiftPackageProductDependency section */

Ghostly.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -16,6 +16,9 @@ final class AppState {
             updateTabShortcuts(enabled: isMenuPresented)
         }
     }
+    var isPinned: Bool = UserDefaults.standard.bool(forKey: "isPinned") {
+        didSet { UserDefaults.standard.set(isPinned, forKey: "isPinned") }
+    }
     let settingsManager = SettingsManager()
     var isSettingsOpen: Bool {
         get { settingsManager.isSettingsOpen }

Ghostly/AppState.swift

@@ -24,7 +24,7 @@ struct GhostlyApp: App {
                 }
         }
         .menuBarExtraStyle(.window)
-        .menuBarExtraAccess(isPresented: $appState.isMenuPresented) { statusItem in
+        .menuBarExtraAccess(isPresented: $appState.isMenuPresented, staysOpen: $appState.isPinned) { statusItem in
             statusItemContextMenuController.configure(statusItem: statusItem, appState: appState)
         }
     }

Ghostly/GhostlyApp.swift

@@ -50,7 +50,7 @@ struct ContentView: View {
             ).ignoresSafeArea()
 
             VStack(alignment: .leading, spacing: 0) {
-                HeaderView(settingsManager: settingsManager)
+                HeaderView(appState: appState)
 
                 if tabManager.tabs.count > 1 {
                     TabBarView(tabManager: tabManager)

Ghostly/Views/ContentView.swift

@@ -8,9 +8,11 @@
 import SwiftUI
 
 struct HeaderView: View {
-    var settingsManager: SettingsManager
+    @Bindable var appState: AppState
     @State private var isHovered = false
 
+    private var settingsManager: SettingsManager { appState.settingsManager }
+
     var body: some View {
         VStack(spacing: 0) {
             HStack {
@@ -35,6 +37,20 @@ struct HeaderView: View {
 
                 Spacer()
 
+                // Pin button — keeps window open when focus moves to another app
+                Button {
+                    appState.isPinned.toggle()
+                } label: {
+                    Image(systemName: appState.isPinned ? "pin.fill" : "pin")
+                        .font(.system(size: 12))
+                        .foregroundStyle(appState.isPinned ? Color.catLavender : Color.catOverlay.opacity(0.7))
+                        .rotationEffect(.degrees(45))
+                }
+                .buttonStyle(.plain)
+                .frame(width: 28, height: 28)
+                .help(appState.isPinned ? "Unpin (window will close when focus is lost)" : "Pin (keep window open when switching apps)")
+                .accessibilityIdentifier("pinButton")
+
                 // Menu button
                 DropdownMenuView(settingsManager: settingsManager)
                     .frame(width: 28, height: 28)

Ghostly/Views/HeaderView.swift

@@ -0,0 +1,20 @@
+// swift-tools-version: 5.7
+
+import PackageDescription
+
+let package = Package(
+    name: "MenuBarExtraAccess",
+    platforms: [.macOS(.v10_15)],
+    products: [
+        .library(name: "MenuBarExtraAccess", targets: ["MenuBarExtraAccess"])
+    ],
+    targets: [
+        .target(
+            name: "MenuBarExtraAccess",
+            swiftSettings: [
+                // un-comment to enable debug logging
+                // .define("MENUBAREXTRAACCESS_DEBUG_LOGGING=1")
+            ]
+        )
+    ]
+)

LocalPackages/MenuBarExtraAccess/Package.swift

@@ -0,0 +1,35 @@
+//
+//  MenuBarExtra Window Introspection.swift
+//  MenuBarExtraAccess • https://github.com/orchetect/MenuBarExtraAccess
+//  © 2023 Steffan Andrews • Licensed under MIT License
+//
+
+#if os(macOS)
+
+import SwiftUI
+
+@MainActor // required for Xcode 15 builds
+extension View {
+    /// Provides introspection on the underlying window presented by `MenuBarExtra`.
+    /// Add this view modifier to the top level of the View that occupies the `MenuBarExtra` content.
+    /// If more than one MenuBarExtra are used in the app, provide the sequential index number of the `MenuBarExtra`.
+    public func introspectMenuBarExtraWindow(
+        index: Int = 0,
+        _ block: @escaping (_ window: NSWindow) -> Void
+    ) -> some View {
+        self
+            .onAppear {
+                guard let window = MenuBarExtraUtils.window(for: .index(index)) else {
+                    #if MENUBAREXTRAACCESS_DEBUG_LOGGING
+                    print("Cannot call introspection block for status item because its window could not be found.")
+                    #endif
+                    
+                    return
+                }
+                
+                block(window)
+            }
+    }
+}
+
+#endif