Toru NayukiandKirill Bulatov
a6cf4032e6
Addresses #9640 (the Spaces part). On macOS, Zed already restores each window's size, position, and display, but not its Space (virtual desktop). So after a restart, all windows open on whatever Space is active at launch, not the Space they were on before. This is the most reported problem in #9640. A window's Space is not part of the window bounds we save. It is handled by AppKit's own window state restoration. So instead of tracking the Space myself, this PR uses that AppKit feature: - I mark `GPUIWindow` as restorable and encode its native state (frame + Space) by calling `encodeRestorableStateWithCoder:` with an `NSKeyedArchiver`. A delegate skips the `NSView`/`NSWindow` objects that do not support `NSSecureCoding`. - I save the blob per workspace in a new `restorable_window_states` table. - When a saved workspace is opened again, I create the window and then replay the blob with `restoreStateWithCoder:`. AppKit then moves the window back to its Space. On other platforms, and when there is no saved blob, this does nothing. Verification: - Added a round-trip test for the database part (save / overwrite / read, and `ON DELETE CASCADE`). - The macOS encode/restore part calls into AppKit, so I could not unit-test it. I checked it by hand: I put several windows on different Spaces, quit with Cmd+Q, started Zed again, and each window came back on the Space it was closed on. I also checked that the saved blob is a real AppKit archive (it starts with `bplist00`). For now this only works for local workspaces. Remote workspaces could use the same way later. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - macOS: Restored windows now reopen on the Space (virtual desktop) they were on, instead of all landing on the currently active Space. --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking discussion)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.