v0.3.6; regression fix: not popping up in full-screen windows

Author: manitofigh

Sources/Core/AppInfo.swift

@@ -5,5 +5,5 @@ public enum AppInfo {
   /// Reverse-DNS bundle identifier baked into `Info.plist`.
   public static let bundleIdentifier = "com.spotnote.SpotNote"
   /// Marketing version in `MAJOR.MINOR.PATCH` form.
-  public static let version = "0.3.5"
+  public static let version = "0.3.6"
 }

Sources/Spotlight/SpotlightWindow.swift

@@ -10,17 +10,19 @@ public final class SpotlightWindowController {
   nonisolated static let panelStyleMask: NSWindow.StyleMask = [
     .borderless, .fullSizeContentView
   ]
-  /// `.statusBar` floats the HUD above any fullscreen Space. `.floating`
-  /// is below the menu-bar / fullscreen layer, so a fullscreen app
-  /// would hide the panel even when ordered front.
-  nonisolated static let panelLevel: NSWindow.Level = .statusBar
+  /// `.screenSaver` keeps the HUD above the window layers used by
+  /// fullscreen apps. Lower levels such as `.floating` and `.statusBar`
+  /// can still be occluded by fullscreen windows on recent macOS
+  /// releases even when the panel joins that Space.
+  nonisolated static let panelLevel: NSWindow.Level = .screenSaver
   /// `.fullScreenAuxiliary` is the load-bearing flag -- it lets a panel
   /// appear in a fullscreen Space alongside the fullscreen app.
   /// `.canJoinAllSpaces` keeps the panel reachable from every Space,
-  /// and `.stationary` stops it being dragged along during Space
-  /// transitions (which would otherwise yank focus during the swipe).
+  /// `.stationary` stops it being dragged along during Space
+  /// transitions (which would otherwise yank focus during the swipe),
+  /// and `.ignoresCycle` keeps this transient HUD out of Cmd-` cycling.
   nonisolated static let panelCollectionBehavior: NSWindow.CollectionBehavior = [
-    .canJoinAllSpaces, .fullScreenAuxiliary, .stationary
+    .canJoinAllSpaces, .fullScreenAuxiliary, .stationary, .ignoresCycle
   ]
   nonisolated static let defaultUnfocusedAlpha: CGFloat = 0.55
 
@@ -212,7 +214,7 @@ public final class SpotlightWindowController {
       focusOrShow()
     } else {
       NSApp.activate(ignoringOtherApps: true)
-      panel?.makeKeyAndOrderFront(nil)
+      if let panel { bringPanelToFront(panel) }
     }
     if let mostRecent = session.chats.first {
       session.jump(to: mostRecent)
@@ -258,10 +260,15 @@ public final class SpotlightWindowController {
     }
     panel.alphaValue = 1.0
     NSApp.activate(ignoringOtherApps: true)
-    panel.makeKeyAndOrderFront(nil)
+    bringPanelToFront(panel)
     focusTrigger.pulse()
   }
 
+  private func bringPanelToFront(_ panel: NSPanel) {
+    panel.makeKeyAndOrderFront(nil)
+    panel.orderFrontRegardless()
+  }
+
   private func repositionForShow(_ panel: NSPanel) {
     guard let screen = NSScreen.main else { return }
     let screenFrame = screen.visibleFrame
@@ -292,15 +299,7 @@ public final class SpotlightWindowController {
       backing: .buffered,
       defer: false
     )
-    panel.isOpaque = false
-    panel.backgroundColor = .clear
-    panel.hasShadow = true
-    panel.level = Self.panelLevel
-    panel.isFloatingPanel = true
-    panel.hidesOnDeactivate = false
-    panel.becomesKeyOnlyIfNeeded = false
-    panel.isMovableByWindowBackground = true
-    panel.collectionBehavior = Self.panelCollectionBehavior
+    Self.configurePanel(panel)
     panel.contentView = NSHostingView(
       rootView: SpotlightRootView(
         focusTrigger: focusTrigger,
@@ -327,6 +326,18 @@ public final class SpotlightWindowController {
     return panel
   }
 
+  static func configurePanel(_ panel: NSPanel) {
+    panel.isOpaque = false
+    panel.backgroundColor = .clear
+    panel.hasShadow = true
+    panel.isFloatingPanel = true
+    panel.level = panelLevel
+    panel.hidesOnDeactivate = false
+    panel.becomesKeyOnlyIfNeeded = false
+    panel.isMovableByWindowBackground = true
+    panel.collectionBehavior = panelCollectionBehavior
+  }
+
   private static let driftCorrectionThreshold: CGFloat = 4
 
   private func pinnedOrigin(for panel: NSPanel) -> NSPoint? {

Tests/SpotlightTests/SpotlightWindowControllerTests.swift

@@ -13,7 +13,7 @@ struct SpotlightWindowControllerTests {
   /// a visible, keyed window. `.nonactivatingPanel` was tried as part
   /// of an over-fullscreen fix and reproduced exactly that symptom
   /// (HUD never opens). The over-fullscreen path is handled instead
-  /// by `panelLevel == .statusBar` + `.fullScreenAuxiliary` in the
+  /// by `panelLevel == .screenSaver` + `.fullScreenAuxiliary` in the
   /// collection behavior -- see the dedicated tests below.
   @Test("panel style mask must NOT contain .nonactivatingPanel for an LSUIElement app")
   func panelStyleMaskExcludesNonactivating() {
@@ -41,12 +41,33 @@ struct SpotlightWindowControllerTests {
     #expect(behavior.contains(.canJoinAllSpaces))
   }
 
-  /// **Regression guard** -- anything below `.statusBar` is hidden by a
-  /// fullscreen app's window layer. `.floating` was the previous level
-  /// and was the proximate cause of the over-fullscreen bug.
-  @Test("panel level is .statusBar or higher -- required for over-fullscreen HUD")
+  /// **Regression guard** -- recent macOS releases can keep
+  /// fullscreen windows above `.statusBar` auxiliary panels. The HUD is
+  /// transient, so it uses the overlay-grade screen saver level.
+  @Test("panel level is .screenSaver -- required for over-fullscreen HUD")
   func panelLevelIsAboveFullscreen() {
-    #expect(SpotlightWindowController.panelLevel.rawValue >= NSWindow.Level.statusBar.rawValue)
+    #expect(SpotlightWindowController.panelLevel == .screenSaver)
+  }
+
+  @Test("configured panel applies fullscreen overlay behavior")
+  @MainActor
+  func configuredPanelAppliesFullscreenOverlayBehavior() {
+    let panel = SpotlightPanel(
+      contentRect: NSRect(x: 0, y: 0, width: 10, height: 10),
+      styleMask: SpotlightWindowController.panelStyleMask,
+      backing: .buffered,
+      defer: false
+    )
+
+    SpotlightWindowController.configurePanel(panel)
+
+    #expect(panel.level == .screenSaver)
+    #expect(panel.collectionBehavior.contains(.canJoinAllSpaces))
+    #expect(panel.collectionBehavior.contains(.fullScreenAuxiliary))
+    #expect(panel.collectionBehavior.contains(.stationary))
+    #expect(panel.collectionBehavior.contains(.ignoresCycle))
+    #expect(panel.hidesOnDeactivate == false)
+    #expect(panel.isFloatingPanel)
   }
 
   @Test("default unfocused alpha is between 0.5 and 1.0 -- visible but clearly faded")

project.yml

@@ -13,8 +13,8 @@ settings:
     SWIFT_VERSION: "6.0"
     MACOSX_DEPLOYMENT_TARGET: "14.0"
     SWIFT_STRICT_CONCURRENCY: complete
-    MARKETING_VERSION: "0.3.5"
-    CURRENT_PROJECT_VERSION: "8"
+    MARKETING_VERSION: "0.3.6"
+    CURRENT_PROJECT_VERSION: "9"
   configs:
     Debug:
       SWIFT_OPTIMIZATION_LEVEL: -Onone

scripts/build.sh

@@ -33,8 +33,8 @@ cat > "$CONTENTS/Info.plist" <<'PLIST'
   <key>CFBundleName</key>                    <string>SpotNote</string>
   <key>CFBundleDisplayName</key>             <string>SpotNote</string>
   <key>CFBundlePackageType</key>             <string>APPL</string>
-  <key>CFBundleShortVersionString</key>      <string>0.3.5</string>
-  <key>CFBundleVersion</key>                 <string>8</string>
+  <key>CFBundleShortVersionString</key>      <string>0.3.6</string>
+  <key>CFBundleVersion</key>                 <string>9</string>
   <key>LSMinimumSystemVersion</key>          <string>14.0</string>
   <key>LSUIElement</key>                     <true/>
   <key>CFBundleIconFile</key>                <string>AppIcon</string>