title_bar: Show git status indicator icon in the title bar #38029
Conversation
cla-bot
bot
added
the
cla-signed
|
Looks great! |
cole-miller
left a comment
cole-miller
left a comment
There was a problem hiding this comment.
Thanks for opening a PR. I think it's reasonable to have a visual indication of the repository status here, but we should use color-coding like we already do for tab titles and multibuffer headers instead of a + or *.
crates/title_bar/src/title_bar.rs
Outdated
| .map(|name| { | ||
| if !settings.show_branch_status || repo.cached_status().next().is_none() { | ||
| name | ||
| } else if repo | ||
| .cached_status() | ||
| .all(|entry| entry.status.staging().is_fully_staged()) | ||
| { | ||
| format!("{}+", name) | ||
| } else { | ||
| format!("{}*", name) | ||
| } | ||
| }) |
There was a problem hiding this comment.
We shouldn't iterate over the cached status here, instead we should call RepositorySnapshot::status_summary and branch on that (coloring of paths in the project panel should provide an example here).
There was a problem hiding this comment.
Thanks! I tried to add coloring of the branch name by analogy with the coloring of the paths in the project panel, but it looks rather motley (subjectively, but I found it very inconvenient). At the same time, an idea came up that it is possible to add multi-colored icons before the branch name (expand the current logic of displaying the branch icon). What do you think?
Screenshots
There was a problem hiding this comment.
Thanks, seems like a reasonable solution to me.
lzakharov
changed the title
lzakharov
force-pushed
the
title-bar-git-status-indicator
branch
from
d480824 to
fda67ca
Compare
lzakharov
force-pushed
the
title-bar-git-status-indicator
branch
from
fda67ca to
7ee194e
Compare
…tries#38029) See related discussion zed-industries#37046. <details> <summary>Screenshots</summary> **No Changes** <img src="https://github.com/user-attachments/assets/e814da6e-bc9b-4edd-b37a-6bb4680d5bb3" /> **Added** <img src="https://github.com/user-attachments/assets/07ffdf90-08cb-43f4-b2bd-9966a21e08de" /> **Changed** <img src="https://github.com/user-attachments/assets/7e13b999-83b3-41ea-b2ab-baaa1541b169" /> **Deleted** <img src="https://github.com/user-attachments/assets/a77fc7e3-a026-419a-87bd-7146c3ca46a9" /> **Conflicts** <img src="https://github.com/user-attachments/assets/17e7e35c-d81b-4660-808d-08e12107ea2d" /> </details> Release Notes: - Show git status indicator icon in the title bar
3 participants
See related discussion #37046.
Screenshots
No Changes
Added
Changed
Deleted
Conflicts
Release Notes: