fix: keep the attached panel on its display when working on another one

Author: vinimcorrea

README.md

@@ -32,7 +32,7 @@ Your PR sits in **In Review** for two days because nobody noticed it. A teammate
 ## ✨ Features
 
 - 🪟 **Always on top**: a non-activating floating panel that never steals focus, visible on all Spaces and over full-screen apps. Drag it anywhere; near a screen edge or corner it snaps into place like a magnet. Docked at the bottom, the header moves to the bottom row and the tasks open upwards, so the bar never jumps. The panel shrinks to fit short lists (folded sections leave no empty space) and grows back up to the size you dragged it to.
-- 📌 **Attach to Menu Bar**: turn it on in the menu, or just drag the panel up onto the menu bar icon (the icon lights up; let go to attach), and the panel hangs right under the menu bar icon, with a popover arrow pointing at it; click the icon to show or hide it, and a click anywhere outside hides it again, like a menu bar popover. Right-click the icon for the options. Drag the panel away (or untick the option) to detach it and float it anywhere again.
+- 📌 **Attach to Menu Bar**: turn it on in the menu, or just drag the panel up onto the menu bar icon (the icon lights up; let go to attach), and the panel hangs right under the menu bar icon, with a popover arrow pointing at it; click the icon to show or hide it, and a click anywhere outside hides it again, like a menu bar popover. Right-click the icon for the options. Drag the panel away (or untick the option) to detach it and float it anywhere again. With two displays, the panel stays on its display while you work on the other one; click the menu bar icon there to bring it over.
 - 👤 **Mine**: your tasks grouped by status (In Progress, In Review, Reviewed), each with its linked PRs. *User Stories* that have sub-issues are hidden: you follow them through their sub-issues.
 - 🗂️ **Your layout**: click a section header to fold it, and drag headers to put the status you care about first (or right-click → *Move Up* / *Move Down*).
 - 👀 **Reviewing**: the tasks you are reviewing for teammates, split into *Your turn* and *Waiting on the author*, with a notification when a re-review is requested.

Sources/GitHubFloat/main.swift

@@ -487,7 +487,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSWind
             updateOutsideClickMonitor()
             return
         }
-        pinToStatusItem()
+        pinToStatusItem(follow: true)
         if !panel.isVisible || popoverAnimating {
             // Popover-style entrance: grows out of the menu bar icon.
             let wasHidden = !panel.isVisible
@@ -547,7 +547,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSWind
         if wanted, outsideClickMonitor == nil {
             outsideClickMonitor = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseDown, .rightMouseDown, .otherMouseDown]) { [weak self] _ in
                 MainActor.assumeIsolated {
-                    guard let self, !self.isOwnClick(at: NSEvent.mouseLocation) else { return }
+                    let point = NSEvent.mouseLocation
+                    // Working on another display leaves the panel where it is.
+                    guard let self, !self.isOwnClick(at: point), self.screenOfPanel?.frame.contains(point) ?? true else { return }
                     self.hidePanel()
                 }
             }
@@ -638,7 +640,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSWind
         }
     }
 
-    private func pinToStatusItem(expand: Bool = true) {
+    private var iconScreen: NSScreen? {
+        guard let window = statusItem?.button?.window else { return nil }
+        return window.screen ?? NSScreen.screens.first { $0.frame.intersects(window.frame) }
+    }
+
+    /// With several displays the menu bar icon jumps to the display you're using; the panel only follows it when you click the icon.
+    private var panelOnIconScreen: Bool {
+        guard NSScreen.screens.count > 1, panel.isVisible, let icon = iconScreen, let mine = screenOfPanel else { return true }
+        return icon == mine
+    }
+
+    private func pinToStatusItem(expand: Bool = true, follow: Bool = false) {
+        guard follow || panelOnIconScreen else { return }
         if expand, settings.collapsed { settings.collapsed = false }
         defer { arrowX = iconMidX().map { $0 - panel.frame.minX }; updateShape() }
         guard let f = pinnedFrame(), f != panel.frame else { return }
@@ -721,7 +735,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSWind
     }
 
     @objc private func togglePanel() {
-        if panel.isVisible { hidePanel() } else { showPanel() }
+        if panel.isVisible, panelOnIconScreen { hidePanel() } else { showPanel() }
     }
 
     // MARK: Status item