i18uandKirill Bulatov
40102ee7c2
# Objective - Prevent the Zed window height from shrinking to the built-in MacBook screen's height after macOS screen lock or display sleep in multi-monitor setups. - Related to #41246. ## Solution - Ignore window bounds change events in `observe_window_bounds` if the window is currently inactive (`!window.is_window_active()`). - **Explanation**: When the system locks or sleeps, macOS reconfigures displays (monitors power down, and macOS temporarily treats the built-in screen as the only primary display). This triggers a resize event on inactive Zed windows to fit them onto the built-in display. Because the window was inactive, the `observe_window_bounds` listener still triggered and scheduled `save_window_bounds`, immediately overwriting the workspace database with the temporary shrunk dimensions. - By ignoring bounds updates when the window is inactive, we preserve the correct original bounds in the database. Since a user-initiated resize/move always activates/focuses the window first, bounds will still be correctly persisted for intentional manual updates. ## Testing - Yes, tested locally on macOS (Sequoia). - Verified that compiling the `workspace` crate succeeds (`cargo check -p workspace`). - Ran all 220 unit tests in the `workspace` crate (`cargo test -p workspace`), and all passed successfully. - **How to test**: 1. Open Zed on an external monitor and set it to a large size (or maximize). 2. Lock the screen (or let the displays sleep). 3. Wake/unlock the screen. 4. Verify that the window recovers and maintains its original height instead of shrinking. ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - Fixed an issue where the Zed window would shrink to the built-in display's height on macOS after screen lock or display sleep in multi-monitor setups. 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.