diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index b68095878d..0857b2b79a 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -220,29 +220,17 @@ impl CollabTitlebarItem { let branch_prepended = entry .as_ref() .and_then(RepositoryEntry::branch) - .map(|branch| { - format!( - "/{}", - util::truncate_and_trailoff(&branch, MAX_BRANCH_NAME_LENGTH) - ) - }); - let text_style = theme.titlebar.title.clone(); + .map(|branch| util::truncate_and_trailoff(&branch, MAX_BRANCH_NAME_LENGTH)); + let project_style = theme.titlebar.title.clone(); + let git_style = theme.titlebar.git_branch.clone(); + let divider_style = theme.titlebar.project_name_divider.clone(); let item_spacing = theme.titlebar.item_spacing; - let mut highlight = text_style.clone(); - highlight.color = theme.titlebar.highlight_color; - - let style = LabelStyle { - text: text_style, - highlight_text: Some(highlight), - }; - let highlights = (0..name.len()).into_iter().collect(); let mut ret = Flex::row().with_child( Stack::new() .with_child( MouseEventHandler::::new(0, cx, |_, _| { - Label::new(name, style.clone()) - .with_highlights(highlights) + Label::new(name, project_style.text.clone()) .contained() .aligned() .left() @@ -251,28 +239,43 @@ impl CollabTitlebarItem { .with_cursor_style(CursorStyle::PointingHand) .on_click(MouseButton::Left, move |_, this, cx| { this.toggle_project_menu(&Default::default(), cx) - }), + }) + .contained() + .with_style(project_style.container), ) .with_children(self.render_project_popover_host(&theme.titlebar, cx)), ); if let Some(git_branch) = branch_prepended { ret = ret.with_child( - Stack::new() + Flex::row() .with_child( - MouseEventHandler::::new(0, cx, |_, _| { - Label::new(git_branch, style) - .contained() - .with_margin_right(item_spacing) - .aligned() - .left() - .into_any_named("title-project-branch") - }) - .with_cursor_style(CursorStyle::PointingHand) - .on_click(MouseButton::Left, move |_, this, cx| { - this.toggle_vcs_menu(&Default::default(), cx) - }), + Label::new("/", divider_style.text) + .contained() + .with_style(divider_style.container) + .aligned() + .left(), ) - .with_children(self.render_branches_popover_host(&theme.titlebar, cx)), + .with_child( + Stack::new() + .with_child( + MouseEventHandler::::new(0, cx, |_, _| { + Label::new(git_branch, git_style.text) + .contained() + .with_margin_right(item_spacing) + .aligned() + .left() + .into_any_named("title-project-branch") + }) + .with_cursor_style(CursorStyle::PointingHand) + .on_click( + MouseButton::Left, + move |_, this, cx| { + this.toggle_vcs_menu(&Default::default(), cx) + }, + ), + ) + .with_children(self.render_branches_popover_host(&theme.titlebar, cx)), + ), ) } ret.into_any() diff --git a/styles/src/style_tree/titlebar.ts b/styles/src/style_tree/titlebar.ts index 067d619bb5..686f814a5d 100644 --- a/styles/src/style_tree/titlebar.ts +++ b/styles/src/style_tree/titlebar.ts @@ -173,8 +173,9 @@ export function titlebar(theme: ColorScheme): any { }, // Project - title: text(theme.lowest, "sans", "variant"), - highlight_color: text(theme.lowest, "sans", "active").color, + title: text(theme.lowest, "sans", "active"), + project_name_divider: text(theme.lowest, "sans", "variant"), + git_branch: text(theme.lowest, "sans", "variant"), // Collaborators leader_avatar: {