Skip to content

Fix spacing around hidden status bar items - #39992

Merged
danilo-leal merged 3 commits into
zed-industries:mainfrom
kitt-cat:kittcat/fix-spacing-around-hidden-status-bar-items
Oct 17, 2025
Merged

Fix spacing around hidden status bar items#39992
danilo-leal merged 3 commits into
zed-industries:mainfrom
kitt-cat:kittcat/fix-spacing-around-hidden-status-bar-items

Conversation

@kitt-cat

@kitt-cat kitt-cat commented Oct 11, 2025

Copy link
Copy Markdown
Contributor

This is a follow-up PR to #39609, and attempts to address hidden status bar items still contributing to the layout and creating extra spacing.

before using display:none theres extra spaces, afterwords the buttons are always evenly spaced

  • 203cbd6 Adds a .none() method to the gpui::Styled helper trait, so that status items can set their display type to none inside their render method.

  • 249f06e Applies .none() to all the status items.

  • 499f564 At first I was adding an is_visible method to the StatusBarView trait, which would be used to skip status bar items which would just render an empty div anyway, but I felt duplicating the conditions for hiding the buttons between the status items is_visible and render methods could be an attraction for bugs, so I tried to find another approach. This commit contains those changes, reverted immediately (if the is_visible approach is preferred I can bring it back!)

  • f37cb75 (bonus!) Adds a condition to the vim mode indicator to avoid a leading space when there are no pending keys.

Release Notes:

  • N/A

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Oct 11, 2025
@kitt-cat kitt-cat mentioned this pull request Oct 11, 2025
Merged
@kitt-cat
kitt-cat force-pushed the kittcat/fix-spacing-around-hidden-status-bar-items branch from 249f06e to 600c416 Compare October 11, 2025 15:28
danilo-leal
danilo-leal reviewed Oct 14, 2025
View reviewed changes

@danilo-leal danilo-leal left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! I left a little comment, but I think it'd be probably better if you could break the changes into separate pull requests. For example, adding the line ending indicator setting can be a follow-up. It'd be great to make this one focused just on the spacing improvements. Ping me once you've extracted out that bit out of this PR.

Comment thread crates/gpui/src/styled.rs Outdated

/// Sets the display type of the element to `none`.
/// [Docs](https://tailwindcss.com/docs/display)
fn none(mut self) -> Self {

@danilo-leal danilo-leal Oct 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fn none(mut self) -> Self {
fn hidden(mut self) -> Self {

I think this is a bit clearer and more consistent with Tailwind.

@kitt-cat
kitt-cat force-pushed the kittcat/fix-spacing-around-hidden-status-bar-items branch from 600c416 to 94c8c98 Compare October 15, 2025 02:20
@kitt-cat

kitt-cat commented Oct 15, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Sure thing! @danilo-leal

I did notice a problem, children of hidden() elements would still have their prepaint() and paint() methods called, which can case a panic

I tried fixing it at least for this case:

div().hidden().child("oh no");
thread 'main' panicked at crates/gpui/src/elements/text.rs:427:14:
called `Result::unwrap()` on an `Err` value: measurement has not been performed on oh no

But I'm not sure if those are the only places child elements need to be skipped over..

danilo-leal
danilo-leal approved these changes Oct 17, 2025
View reviewed changes

@danilo-leal danilo-leal left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, this looks good; thank you for following up!

@danilo-leal
danilo-leal merged commit 038041c into zed-industries:main Oct 17, 2025
22 checks passed
ConradIrwin pushed a commit that referenced this pull request Oct 20, 2025
@kitt-cat
Add line endings indicator in status bar (#39609)
f7a0971 
Closes #5294

This PR adds a line ending indicator to the status bar, hidden by
default as discussed in
#5294.

### Changes

- 8b063a2 add the indicator and
`status_bar.line_endings_button` setting.

- ~~9926237b709dd4e25ce58d558fd385d63b405f3b changes
`status_bar.line_endings_button` from a boolean to an enum:~~
  <details> <summary> show details </summary>

   - `always`     Always show line endings indicator.
- `non_native` Indicate when line endings do not match the current
platform.
   - `lf_only`    Indicate when using unix-style (LF) line endings only.
- `crlf_only` Indicate when using windows-style (CRLF) line endings
only.
   - `never`      Do not show line endings indicator.
   
I know this many options might be overdoing it, but I was torn between
the pleasant default of `non_native` and the simplicity of `lf_only` /
`crlf_only`.

My thinking was if one is developing on a project which exclusively uses
one line-ending style or the other, it would be nice to be able to
configure no-indicator-in-the-happy-case behavior regardless of the
platform zed is running on. But I'm not really familiar with any
projects that use exclusively CRLF line endings in practice. Is this a
scenario worth supporting or just something I dreamed up?

   </details>

- 0117419 rename the action context for
`line ending: Toggle` -> `line ending selector: Toggle`.
When running the action in the command palette with the old name I felt
surprised to be greeted with an additional menu, with the new name it
feels more predictable (plus now it matches
`language_selector::Toggle`!)

### Future work

Hidden status bar items still get padding, creating inconsistent spacing
(and it kind of stands out where I placed the line-endings button):

<img alt="the gap after the indicator is larger than for other buttons"
src="https://github.com/user-attachments/assets/24a346d4-3ff6-4f7f-bd87-64d453c2441a"
/>

I started a new follow-up PR to address that:
#39992

Release Notes:

- Added line ending indicator to the status bar (disabled by default;
enabled by setting `status_bar.line_endings_button` to `true`)
jasonsmithio pushed a commit to paddleboarddev/paddleboard that referenced this pull request May 31, 2026
@kitt-cat
Add line endings indicator in status bar (#39609)
807ef59 
Closes #5294

This PR adds a line ending indicator to the status bar, hidden by
default as discussed in
zed-industries/zed#5294.

### Changes

- 8b063a22d8700bed9c93989b9e0f6a064b2e86cf add the indicator and
`status_bar.line_endings_button` setting.

- ~~9926237b709dd4e25ce58d558fd385d63b405f3b changes
`status_bar.line_endings_button` from a boolean to an enum:~~
  <details> <summary> show details </summary>

   - `always`     Always show line endings indicator.
- `non_native` Indicate when line endings do not match the current
platform.
   - `lf_only`    Indicate when using unix-style (LF) line endings only.
- `crlf_only` Indicate when using windows-style (CRLF) line endings
only.
   - `never`      Do not show line endings indicator.
   
I know this many options might be overdoing it, but I was torn between
the pleasant default of `non_native` and the simplicity of `lf_only` /
`crlf_only`.

My thinking was if one is developing on a project which exclusively uses
one line-ending style or the other, it would be nice to be able to
configure no-indicator-in-the-happy-case behavior regardless of the
platform zed is running on. But I'm not really familiar with any
projects that use exclusively CRLF line endings in practice. Is this a
scenario worth supporting or just something I dreamed up?

   </details>

- 01174191e4cf337069e7a31b0f0432ae94c52515 rename the action context for
`line ending: Toggle` -> `line ending selector: Toggle`.
When running the action in the command palette with the old name I felt
surprised to be greeted with an additional menu, with the new name it
feels more predictable (plus now it matches
`language_selector::Toggle`!)

### Future work

Hidden status bar items still get padding, creating inconsistent spacing
(and it kind of stands out where I placed the line-endings button):

<img alt="the gap after the indicator is larger than for other buttons"
src="https://github.com/user-attachments/assets/24a346d4-3ff6-4f7f-bd87-64d453c2441a"
/>

I started a new follow-up PR to address that:
zed-industries/zed#39992

Release Notes:

- Added line ending indicator to the status bar (disabled by default;
enabled by setting `status_bar.line_endings_button` to `true`)
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
@kitt-cat
Fix spacing around hidden status bar items (zed-industries#39992)
0fc7b78 
This is a follow-up PR to
zed-industries#39609, and attempts to
address hidden status bar items still contributing to the layout and
creating extra spacing.

![before using display:none theres extra spaces, afterwords the buttons
are always evenly
spaced](https://github.com/user-attachments/assets/3bd07837-5f6f-4ca1-8985-9f3cb8b6893d)

- 203cbd6 Adds a `.none()` method to
the `gpui::Styled` helper trait, so that status items can set their
display type to none inside their `render` method.

- 249f06e Applies `.none()` to all the
status items.

- ~~499f564906c88336608c81615b11ebc9ab43d832~~ At first I was adding an
`is_visible` method to the `StatusBarView` trait, which would be used to
skip status bar items which would just render an empty div anyway, but I
felt duplicating the conditions for hiding the buttons between the
status items `is_visible` and `render` methods could be an attraction
for bugs, so I tried to find another approach. This commit contains
those changes, reverted immediately (if the `is_visible` approach is
preferred I can bring it back!)

- f37cb75 (bonus!) Adds a condition to
the vim mode indicator to avoid a leading space when there are no
pending keys.

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@danilo-leal danilo-leal danilo-leal approved these changes

Assignees

@mattermill mattermill

@danilo-leal danilo-leal

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kitt-cat @danilo-leal @mattermill