Skip to content

Fix menu-bar icon sizing stability #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FarnoodF wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix menu-bar icon sizing stability #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions App.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,42 @@ enum SleepGlyph {
private func makeCupGlyph(_ glyph: SleepGlyph) -> NSImage {
let cfg = NSImage.SymbolConfiguration(pointSize: 15, weight: .regular).applying(.init(scale: .medium))
let name = (glyph == .off) ? "cup.and.saucer" : "cup.and.heat.waves.fill"
let base = NSImage(systemSymbolName: name, accessibilityDescription: "Sleepless")?
.withSymbolConfiguration(cfg)
?? NSImage(systemSymbolName: "cup.and.saucer.fill", accessibilityDescription: "Sleepless")
?? NSImage()
func symbol(_ name: String) -> NSImage? {
NSImage(systemSymbolName: name, accessibilityDescription: "Sleepless")?
.withSymbolConfiguration(cfg)
}
let base = symbol(name) ?? symbol("cup.and.saucer.fill") ?? NSImage()

guard glyph == .armed else {
let symbolSize = base.size
guard symbolSize.width > 0, symbolSize.height > 0 else {
base.isTemplate = true
return base
}
// ARMED: full steaming cup + a small filled dot top-right (the "auto-off safety net is live"
// mark). Drawn in template black so it tints + inverts with the menu bar exactly like the cup.
let size = base.size
guard size.width > 0, size.height > 0 else { base.isTemplate = true; return base }
let composed = NSImage(size: size)

let canvasSize = ["cup.and.saucer", "cup.and.heat.waves.fill"]
.compactMap { symbol($0)?.size }
.reduce(symbolSize) { size, candidate in
NSSize(width: max(size.width, candidate.width), height: max(size.height, candidate.height))
}

let composed = NSImage(size: canvasSize)
composed.lockFocus()
base.draw(in: NSRect(origin: .zero, size: size))
let d = max(size.height * 0.26, 4)
let dot = NSBezierPath(ovalIn: NSRect(x: size.width - d, y: size.height - d, width: d, height: d))
NSColor.black.setFill()
dot.fill()
base.draw(in: NSRect(x: (canvasSize.width - symbolSize.width) / 2,
y: (canvasSize.height - symbolSize.height) / 2,
width: symbolSize.width,
height: symbolSize.height))

if glyph == .armed {
// ARMED: full steaming cup + a small filled dot top-right (the "auto-off safety net is live"
// mark). Drawn in template black so it tints + inverts with the menu bar exactly like the cup.
let d = max(symbolSize.height * 0.26, 4)
let dot = NSBezierPath(ovalIn: NSRect(x: canvasSize.width - d, y: canvasSize.height - d, width: d, height: d))
NSColor.black.setFill()
dot.fill()
}

composed.unlockFocus()
composed.alignmentRect = NSRect(origin: .zero, size: canvasSize)
composed.isTemplate = true
return composed
}
Expand Down Expand Up @@ -173,7 +188,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(_ notification: Notification) {
NSApp.setActivationPolicy(.accessory)
batteryFloorPercent = min(max((UserDefaults.standard.object(forKey: floorKey) as? Int) ?? floorDefault, floorMin), floorMax)
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
if let button = statusItem.button {
button.image = offGlyph
button.action = #selector(statusClicked)
Expand Down