zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix styling of titlebar highlights

Browse Source
This commit is contained in:
Mikayla Maki 2023-05-08 14:32:31 -07:00
parent 712fb5ad7f
commit f28419cfd1
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/collab_ui/src/collab_titlebar_item.rs
View File

@ -201,12 +201,12 @@ impl CollabTitlebarItem {
let mut title = String::new();
let mut names_and_branches = names_and_branches.peekable();
while let Some((name, entry)) = names_and_branches.next() {
let pre_index = index;
push_str(&mut title, &mut index, name);
indices.extend((pre_index..index).into_iter());
if let Some(branch) = entry.and_then(|entry| entry.branch()) {
push_str(&mut title, &mut index, "/");
let pre_index = index;
push_str(&mut title, &mut index, &branch);
indices.extend((pre_index..index).into_iter())
}
if names_and_branches.peek().is_some() {
push_str(&mut title, &mut index, ", ");

2
crates/rpc/src/proto.rs
View File

@ -504,7 +504,7 @@ pub fn split_worktree_update(
done = message.updated_entries.is_empty() && message.removed_entries.is_empty();
// Wait to send repositories until after we've guarnteed that their associated entries
// Wait to send repositories until after we've guaranteed that their associated entries
// will be read
let updated_repositories = if done {
mem::take(&mut message.updated_repositories)