hl-valdemar/conjure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix: optically center shortcut glyphs and tighten badge gaps

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-10-13 17:18:41 +02:00
parent 026d240d24
commit 6f3f373f20
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Conjure/LauncherWindowController.swift
+14 -15
View File
@@ -1,5 +1,6 @@
import AppKit
import ConjureKit
import CoreText
@MainActor
final class LauncherWindowController: NSWindowController, NSWindowDelegate, NSSearchFieldDelegate, NSTableViewDataSource, NSTableViewDelegate {
@@ -321,7 +322,7 @@ final class LauncherWindowController: NSWindowController, NSWindowDelegate, NSSe
actionsButton.leadingAnchor.constraint(equalTo: returnKey.trailingAnchor, constant: 14),
commandKey.leadingAnchor.constraint(equalTo: actionsButton.trailingAnchor, constant: 8),
commandKey.centerYAnchor.constraint(equalTo: actionPill.centerYAnchor),
kKey.leadingAnchor.constraint(equalTo: commandKey.trailingAnchor, constant: 8),
kKey.leadingAnchor.constraint(equalTo: commandKey.trailingAnchor, constant: 4),
kKey.centerYAnchor.constraint(equalTo: actionPill.centerYAnchor),
kKey.trailingAnchor.constraint(equalTo: actionPill.trailingAnchor, constant: -12),
actionsButton.centerYAnchor.constraint(equalTo: actionPill.centerYAnchor),
@@ -724,22 +725,20 @@ func shortcutBadge(_ title: String) -> NSTextField {
@MainActor
private final class ShortcutBadge: NSTextField {
override class var cellClass: AnyClass? {
get { ShortcutBadgeCell.self }
set { super.cellClass = newValue }
}
// NSTextField's horizontal alignment insets otherwise make an 18-point badge 22 points wide.
override var alignmentRectInsets: NSEdgeInsets { NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) }
}
@MainActor
private final class ShortcutBadgeCell: NSTextFieldCell {
override func drawingRect(forBounds rect: NSRect) -> NSRect {
var textRect = super.drawingRect(forBounds: rect)
let textHeight = cellSize(forBounds: rect).height
textRect.origin.y += (textRect.height - textHeight) / 2
textRect.size.height = textHeight
return textRect
override func draw(_ dirtyRect: NSRect) {
guard let context = NSGraphicsContext.current?.cgContext else { return }
let line = CTLineCreateWithAttributedString(attributedStringValue)
let ink = CTLineGetBoundsWithOptions(line, .useGlyphPathBounds)
context.saveGState()
context.textMatrix = .identity
// Center visible ink, not the font's asymmetric ascender/descender line box.
context.translateBy(x: bounds.midX - ink.midX, y: bounds.midY + ink.midY)
context.scaleBy(x: 1, y: -1)
context.textPosition = .zero
CTLineDraw(line, context)
context.restoreGState()
}
}
Sources/Conjure/UninstallReviewController.swift
+1 -1
View File
@@ -130,7 +130,7 @@ final class UninstallReviewController: NSViewController, NSSearchFieldDelegate,
remove.centerYAnchor.constraint(equalTo: pill.centerYAnchor),
commandKey.leadingAnchor.constraint(equalTo: remove.trailingAnchor, constant: 8),
commandKey.centerYAnchor.constraint(equalTo: pill.centerYAnchor),
returnKey.leadingAnchor.constraint(equalTo: commandKey.trailingAnchor, constant: 8),
returnKey.leadingAnchor.constraint(equalTo: commandKey.trailingAnchor, constant: 4),
returnKey.centerYAnchor.constraint(equalTo: pill.centerYAnchor),
returnKey.trailingAnchor.constraint(equalTo: pill.trailingAnchor, constant: -12)
])