Prevent window title overlay on Sequoia

p0deje · Aug 26, 2024 · c2caadf · c2caadf
1 parent 5553931
commit c2caadf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 109 deletions.
diff --git a/Maccy/AppDelegate.swift b/Maccy/AppDelegate.swift
@@ -92,7 +92,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     panel = FloatingPanel(
       contentRect: NSRect(origin: .zero, size: Defaults[.windowSize]),
-      title: Bundle.main.bundleIdentifier ?? "org.p0deje.Maccy",
+      identifier: Bundle.main.bundleIdentifier ?? "org.p0deje.Maccy",
       statusBarButton: statusItem.button
     ) {
       ContentView()

diff --git a/Maccy/FloatingPanel.swift b/Maccy/FloatingPanel.swift
@@ -14,7 +14,7 @@ class FloatingPanel<Content: View>: NSPanel, NSWindowDelegate {
 
   init(
     contentRect: NSRect,
-    title: String = "",
+    identifier: String = "",
     statusBarButton: NSStatusBarButton? = nil,
     view: () -> Content
   ) {
@@ -26,7 +26,7 @@ class FloatingPanel<Content: View>: NSPanel, NSWindowDelegate {
     )
 
     self.statusBarButton = statusBarButton
-    self.title = title
+    self.identifier = NSUserInterfaceItemIdentifier(identifier)
 
     Defaults[.windowSize] = contentRect.size
     delegate = self
@@ -45,7 +45,6 @@ class FloatingPanel<Content: View>: NSPanel, NSWindowDelegate {
     standardWindowButton(.miniaturizeButton)?.isHidden = true
     standardWindowButton(.zoomButton)?.isHidden = true
 
-
     contentView = NSHostingView(
       rootView: view()
         // The safe area is ignored because the title bar still interferes with the geometry

diff --git a/Maccy/Views/ContentView.swift b/Maccy/Views/ContentView.swift
@@ -46,12 +46,16 @@ struct ContentView: View {
     .environment(\.scenePhase, scenePhase)
     // FloatingPanel is not a scene, so let's implement custom scenePhase..
     .onReceive(NotificationCenter.default.publisher(for: NSWindow.didBecomeKeyNotification)) {
-      if ($0.object as? NSWindow)?.title == Bundle.main.bundleIdentifier {
+      if let window = $0.object as? NSWindow,
+         let bundleIdentifier = Bundle.main.bundleIdentifier,
+         window.identifier == NSUserInterfaceItemIdentifier(bundleIdentifier) {
         scenePhase = .active
       }
     }
     .onReceive(NotificationCenter.default.publisher(for: NSWindow.didResignKeyNotification)) {
-      if ($0.object as? NSWindow)?.title == Bundle.main.bundleIdentifier {
+      if let window = $0.object as? NSWindow,
+         let bundleIdentifier = Bundle.main.bundleIdentifier,
+         window.identifier == NSUserInterfaceItemIdentifier(bundleIdentifier) {
         scenePhase = .background
       }
     }

diff --git a/MaccyTests/MenuFoooterTests.swift b/MaccyTests/MenuFoooterTests.swift