Skip to content

Fix macOS system window tabs sync after merging windows#59262

Open
zjarlin wants to merge 1 commit into
zed-industries:mainfrom
zjarlin:fix-macos-system-window-tabs-sync
Open

Fix macOS system window tabs sync after merging windows#59262
zjarlin wants to merge 1 commit into
zed-industries:mainfrom
zjarlin:fix-macos-system-window-tabs-sync

Conversation

@zjarlin

@zjarlin zjarlin commented Jun 13, 2026

Copy link
Copy Markdown

Summary

  • sync GPUI system window tab groups from AppKit tabbedWindows after macOS finishes mergeAllWindows:
  • keep the existing in-memory merge behavior as a fallback when the platform does not report tabbed windows
  • reuse the macOS merge callback path so menu-driven merges and programmatic merges update the same state

Fixes #49724

Testing

  • cargo fmt --all
  • cargo check -p gpui
  • cargo check -p platform_title_bar
  • cargo check -p gpui_macos --features runtime_shaders

cargo check -p gpui_macos without runtime_shaders was blocked locally because this machine only has Command Line Tools selected and xcrun could not find metal/xcodebuild. The runtime_shaders check validates the Rust changes without offline Metal shader compilation.

@cla-bot

cla-bot Bot commented Jun 13, 2026

Copy link
Copy Markdown

We require contributors to sign our Contributor License Agreement, and we don't have @zjarlin on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@zed-community-bot zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Jun 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

“Merge All Windows” only shows one tab instead of merging both windows

1 participant