Skip to content

Follow-up to #5102: simplify titlebar inset + fix sidebar-toggle animation desync #5104

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

Merged
austinywang merged 1 commit into from
Jun 1, 2026
Merged

Follow-up to #5102: simplify titlebar inset + fix sidebar-toggle animation desync #5104

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
9 changes: 8 additions & 1 deletion Sources/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2427,7 +2427,14 @@ struct ContentView: View {
// not the sidebar" intent. The left sidebar's titlebar controls live in
// the AppKit titlebar accessory (above this band), so only the trailing
// (right-sidebar) edge needs to be ceded here.
.padding(.trailing, rightSidebarVisible ? rightSidebarWidth : 0)
//
// `rightSidebarWidth` is already `rightSidebarVisible ? fileExplorerWidth : 0`,
// so it collapses to 0 when the sidebar is hidden. The sidebar panel itself
// snaps without animation (`.transaction { $0.animation = nil }`), so we match
// that here — otherwise this inset could animate out of step with the panel on
// toggle and momentarily expose (or re-cover) the mode bar mid-transition.
.padding(.trailing, rightSidebarWidth)
.animation(nil, value: rightSidebarWidth)
}
.overlay(alignment: .topLeading) {
if isFullScreen && sidebarState.isVisible {
Expand Down
Loading