Skip to content

fix for workspace minification glitch #10061

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

Draft
dannyboy-ai wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −1
Draft

fix for workspace minification glitch #10061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d4a57
test: cover zero-sized sidebar shortcut hint layout
dannyboy-ai Aug 13, 2026
14490ff
fix: clamp sidebar shortcut hint layout
dannyboy-ai Aug 13, 2026
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
6 changes: 5 additions & 1 deletion Sources/Sidebar/AppKitList/Cells/SidebarGroupHeaderRowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,11 @@ final class SidebarShortcutHintPillView: NSView {
let radius = bounds.height / 2
materialView.frame = bounds
materialView.layer?.cornerRadius = radius
label.frame = materialView.bounds.insetBy(dx: Self.horizontalPadding, dy: 2)
let labelBounds = materialView.bounds
label.frame = labelBounds.insetBy(
dx: min(Self.horizontalPadding, labelBounds.width / 2),
dy: min(2, labelBounds.height / 2)
)
layer?.shadowPath = CGPath(
roundedRect: bounds,
cornerWidth: radius,
Expand Down
11 changes: 11 additions & 0 deletions cmuxTests/SidebarWorkspaceTableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ struct SidebarWorkspaceTableTests {
#expect(!hoverTrackingArea.options.contains(.activeInKeyWindow))
}

@Test
@MainActor
func zeroSizedShortcutHintPillKeepsLabelInsideBounds() throws {
let pill = SidebarShortcutHintPillView()
pill.layout()
let materialView = try #require(pill.subviews.first as? NSVisualEffectView)
let label = try #require(materialView.subviews.first as? NSTextField)

#expect(label.frame == .zero)
}

@Test
func rowHeightEstimateAccountsForScaleWrappingAndDetails() {
let calculator = SidebarWorkspaceTableRowHeightCalculator()
Expand Down