Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Keep a hidden Peel in the Dock

Țugui Dragoșc0e613ee86aa
diff --git a/GUIDE.md b/GUIDE.md
index 519a5b37..64092894 100644
--- a/GUIDE.md
+++ b/GUIDE.md
@@ -416,7 +416,8 @@ Privacy, which says what Peel sends and every place it may contact, and Helper.
With Show in Menu Bar on, Peel's menu bar item lists what each tool found the last time it looked, a line per tool
that opens it in Peel. It never adds them up into one figure and never selects anything for you. Turn on Hide from the
Dock while no window is open as well, and Peel's icon leaves the Dock when you close its last window, then comes back
-when you open Peel again from the menu bar, Finder, or Spotlight.
+when you open Peel again from the menu bar, Finder, or Spotlight. While Peel is hidden its icon stays in the Dock,
+where a hidden app is brought back.
## The `peel` command
diff --git a/Peel/Model/DockPresence.swift b/Peel/Model/DockPresence.swift
index 3eca7034..3f6641fd 100644
--- a/Peel/Model/DockPresence.swift
+++ b/Peel/Model/DockPresence.swift
@@ -9,8 +9,12 @@ final class DockPresence {
private init() {}
- static func belongsInTheDock(hidesFromDock: Bool, showsInMenuBar: Bool, hasAWindowOpen: Bool) -> Bool {
- !hidesFromDock || !showsInMenuBar || hasAWindowOpen
+ /// Whether Peel belongs in the Dock. Hidden, it stays there, since the Dock is where a person brings a hidden app
+ /// back: out of the Dock, hidden, Peel would have no way back.
+ static func belongsInTheDock(
+ hidesFromDock: Bool, showsInMenuBar: Bool, hasAWindowOpen: Bool, isHidden: Bool
+ ) -> Bool {
+ isHidden || !hidesFromDock || !showsInMenuBar || hasAWindowOpen
}
func start() {
@@ -23,6 +27,11 @@ final class DockPresence {
DockPresence.shared.update(closing: window)
}
})
+ for name in [NSApplication.didHideNotification, NSApplication.didUnhideNotification] {
+ observers.append(center.addObserver(forName: name, object: nil, queue: nil) { _ in
+ MainActor.assumeIsolated { DockPresence.shared.update() }
+ })
+ }
for name in [NSWindow.didBecomeKeyNotification, NSWindow.didChangeOcclusionStateNotification] {
observers.append(center.addObserver(forName: name, object: nil, queue: nil) { note in
let window = note.object as? NSWindow
@@ -42,7 +51,8 @@ final class DockPresence {
let inTheDock = Self.belongsInTheDock(
hidesFromDock: defaults.bool(forKey: SettingsKey.hidesFromDock),
showsInMenuBar: defaults.bool(forKey: SettingsKey.showsInMenuBar),
- hasAWindowOpen: NSApp.windows.containsAnOpenWindow(besides: closing)
+ hasAWindowOpen: NSApp.windows.containsAnOpenWindow(besides: closing),
+ isHidden: NSApp.isHidden
)
let policy: NSApplication.ActivationPolicy = inTheDock ? .regular : .accessory
if NSApp.activationPolicy() != policy {
diff --git a/PeelTests/DockPresenceTests.swift b/PeelTests/DockPresenceTests.swift
index b917eb8d..d08ca4b9 100644
--- a/PeelTests/DockPresenceTests.swift
+++ b/PeelTests/DockPresenceTests.swift
@@ -4,10 +4,14 @@ import Testing
struct DockPresenceTests {
@Test func leavesTheDockOnlyWhenAskedWhileInTheMenuBarWithNoWindowOpen() {
- #expect(!DockPresence.belongsInTheDock(hidesFromDock: true, showsInMenuBar: true, hasAWindowOpen: false))
- #expect(DockPresence.belongsInTheDock(hidesFromDock: true, showsInMenuBar: true, hasAWindowOpen: true))
- #expect(DockPresence.belongsInTheDock(hidesFromDock: true, showsInMenuBar: false, hasAWindowOpen: false))
- #expect(DockPresence.belongsInTheDock(hidesFromDock: false, showsInMenuBar: true, hasAWindowOpen: false))
+ #expect(!inTheDock(hidesFromDock: true, showsInMenuBar: true, hasAWindowOpen: false))
+ #expect(inTheDock(hidesFromDock: true, showsInMenuBar: true, hasAWindowOpen: true))
+ #expect(inTheDock(hidesFromDock: true, showsInMenuBar: false, hasAWindowOpen: false))
+ #expect(inTheDock(hidesFromDock: false, showsInMenuBar: true, hasAWindowOpen: false))
+ }
+
+ @Test func staysInTheDockWhileHidden() {
+ #expect(inTheDock(hidesFromDock: true, showsInMenuBar: true, hasAWindowOpen: false, isHidden: true))
}
@Test func countsAMinimizedWindowButNeitherOneClosingNorOneThatCantBeMain() {
@@ -17,6 +21,15 @@ struct DockPresenceTests {
#expect(![open, window(visible: true, mayBeMain: false), window()].containsAnOpenWindow(besides: open))
}
+ private func inTheDock(
+ hidesFromDock: Bool, showsInMenuBar: Bool, hasAWindowOpen: Bool, isHidden: Bool = false
+ ) -> Bool {
+ DockPresence.belongsInTheDock(
+ hidesFromDock: hidesFromDock, showsInMenuBar: showsInMenuBar, hasAWindowOpen: hasAWindowOpen,
+ isHidden: isHidden
+ )
+ }
+
private func window(visible: Bool = false, minimized: Bool = false, mayBeMain: Bool = true) -> NSWindow {
let window = StandInWindow(contentRect: .zero, styleMask: .titled, backing: .buffered, defer: true)
window.onScreen = visible