Merge branch 'feat/detachable-window'

lukepistrol · Feb 13, 2024 · 36ee469 · 36ee469
2 parents 69e910d + 6933903
commit 36ee469
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 13 deletions.
diff --git a/TimeMachineStatus/AppDelegate.swift b/TimeMachineStatus/AppDelegate.swift
@@ -23,6 +23,16 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     var hostingView: NSHostingView<StatusBarItem>?
     var popover: NSPopover?
 
+    lazy var detachedWindowController: DetachedWindowController = {
+        let menuView = MenuView(utility: utility, updater: updaterController.updater)
+        let windowController = DetachedWindowController(
+            window: .init(contentViewController: NSHostingController(
+                rootView: menuView
+            ))
+        )
+        return windowController
+    }()
+
     let utility: TMUtility = .init()
 
     var updaterController: SPUStandardUpdaterController!
@@ -81,29 +91,44 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if popover.isShown {
             popover.performClose(sender)
         } else {
-            popover.show(relativeTo: sender.bounds, of: sender, preferredEdge: .maxY)
-            // fixes popover not being fully visible on the right side of the screen
-            if let popoverFrame = popover.contentViewController?.view.window?.frame,
-               let screenFrame = popover.contentViewController?.view.window?.screen?.frame,
-               (popoverFrame.origin.x + Constants.Sizes.popoverWidth + 25) > screenFrame.width {
-                popover.contentViewController?.view.window?.setFrameOrigin(
-                    NSPoint(x: screenFrame.width - Constants.Sizes.popoverWidth - 25, y: popoverFrame.origin.y)
-                )
+            if let detachedWindow = detachedWindowController.window, detachedWindow.isVisible {
+                detachedWindow.orderFrontRegardless()
+            } else {
+                popover.show(relativeTo: sender.bounds, of: sender, preferredEdge: .maxY)
+                // fixes popover not being fully visible on the right side of the screen
+                if let popoverFrame = popover.contentViewController?.view.window?.frame,
+                   let screenFrame = popover.contentViewController?.view.window?.screen?.frame,
+                   (popoverFrame.origin.x + Constants.Sizes.popoverWidth + 25) > screenFrame.width {
+                    popover.contentViewController?.view.window?.setFrameOrigin(
+                        NSPoint(x: screenFrame.width - Constants.Sizes.popoverWidth - 25, y: popoverFrame.origin.y)
+                    )
+                }
+                popover.contentViewController?.view.window?.becomeKey()
             }
-            popover.contentViewController?.view.window?.becomeKey()
         }
     }
 
     private func setupPopover() {
         let menuView = MenuView(utility: utility, updater: updaterController.updater)
         popover = NSPopover()
+        popover?.delegate = self
         popover?.contentViewController = NSHostingController(rootView: menuView)
         popover?.animates = false
-        popover?.behavior = .applicationDefined
+        popover?.behavior = .semitransient
         popover?.setValue(true, forKeyPath: "shouldHideAnchor") // hide arrow
     }
 }
 
+extension AppDelegate: NSPopoverDelegate {
+    func popoverShouldDetach(_ popover: NSPopover) -> Bool {
+        return true
+    }
+
+    func detachableWindow(for popover: NSPopover) -> NSWindow? {
+        return detachedWindowController.window
+    }
+}
+
 extension AppDelegate: SPUStandardUserDriverDelegate {
     var supportsGentleScheduledUpdateReminders: Bool {
         return true
@@ -116,3 +141,22 @@ extension AppDelegate: SPUStandardUserDriverDelegate {
         return true
     }
 }
+
+class DetachedWindowController: NSWindowController {
+    init(window: NSWindow) {
+        super.init(window: window)
+
+        window.styleMask = [
+            .closable,
+            .titled,
+            .fullSizeContentView
+        ]
+        window.titlebarAppearsTransparent = true
+        window.standardWindowButton(.miniaturizeButton)?.isHidden = true
+        window.standardWindowButton(.zoomButton)?.isHidden = true
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
diff --git a/TimeMachineStatus/Localizable.xcstrings b/TimeMachineStatus/Localizable.xcstrings
@@ -1726,6 +1726,29 @@
           }
         }
       }
+    },
+    "window_title" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "TimeMachineStatus"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "TimeMachineStatus"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "TimeMachineStatus"
+          }
+        }
+      }
     }
   },
   "version" : "1.0"

diff --git a/TimeMachineStatus/Views/MenuView.swift b/TimeMachineStatus/Views/MenuView.swift
@@ -38,6 +38,8 @@ struct MenuView: View {
         }
         .frame(width: Constants.Sizes.popoverWidth)
         .fixedSize()
+        .navigationTitle("window_title")
+        .background(.regularMaterial, in: .rect)
     }
 
     @ViewBuilder
@@ -207,18 +209,15 @@ struct MenuView: View {
             Button("settings_button_checkforupdates") {
                 updater.checkForUpdates()
             }
-            .keyboardShortcut("u", modifiers: .command)
             .disabled(!updaterViewModel.canCheckForUpdates)
             Button("button_browsebackups") {
                 utility.launchTimeMachine()
             }
-            .keyboardShortcut("b", modifiers: .command)
             Divider()
             Menu("button_feedback") {
                 Button("button_bug_report_feature_request") {
                     NSWorkspace.shared.open(Constants.URLs.bugReport)
                 }
-                .keyboardShortcut("f", modifiers: .command)
                 Divider()
                 Button("button_view_issues") {
                     NSWorkspace.shared.open(Constants.URLs.issues)