mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-29 05:33:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Switch collaborator list to using own style

Browse source
This commit is contained in:
Julia 2023-01-30 10:18:04 -05:00
parent 2b6aa3f5d1
commit c697c1a96a
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -202,9 +202,9 @@ impl CollabTitlebarItem {
.with_child( .with_child(
MouseEventHandler::<ToggleCollaboratorList>::new(0, cx, |state, _| { MouseEventHandler::<ToggleCollaboratorList>::new(0, cx, |state, _| {
let style = titlebar let style = titlebar
.toggle_contacts_button .toggle_collaborators_button
.style_for(state, self.collaborator_list_popover.is_some()); .style_for(state, self.collaborator_list_popover.is_some());
Svg::new("icons/plus_8.svg") Svg::new("icons/user_group_12.svg")
.with_color(style.color) .with_color(style.color)
.constrained() .constrained()
.with_width(style.icon_width) .with_width(style.icon_width)
@ -228,8 +228,10 @@ impl CollabTitlebarItem {
ChildView::new(popover, cx) ChildView::new(popover, cx)
.contained() .contained()
.with_margin_top(titlebar.height) .with_margin_top(titlebar.height)
.with_margin_left(titlebar.toggle_contacts_button.default.button_width) .with_margin_left(titlebar.toggle_collaborators_button.default.button_width)
.with_margin_right(-titlebar.toggle_contacts_button.default.button_width) .with_margin_right(
-titlebar.toggle_collaborators_button.default.button_width,
)
.boxed(), .boxed(),
) )
.with_fit_mode(OverlayFitMode::SwitchAnchor) .with_fit_mode(OverlayFitMode::SwitchAnchor)

1
crates/theme/src/theme.rs
View file

@ -84,6 +84,7 @@ pub struct Titlebar {
pub outdated_warning: ContainedText, pub outdated_warning: ContainedText,
pub share_button: Interactive<ContainedText>, pub share_button: Interactive<ContainedText>,
pub call_control: Interactive<IconButton>, pub call_control: Interactive<IconButton>,
pub toggle_collaborators_button: Interactive<IconButton>,
pub toggle_contacts_button: Interactive<IconButton>, pub toggle_contacts_button: Interactive<IconButton>,
pub toggle_contacts_badge: ContainerStyle, pub toggle_contacts_badge: ContainerStyle,
} }

15
styles/src/styleTree/workspace.ts
View file

@ -147,6 +147,21 @@ export default function workspace(colorScheme: ColorScheme) {
color: foreground(layer, "variant", "hovered"), color: foreground(layer, "variant", "hovered"),
}, },
}, },
toggleCollaboratorsButton: {
margin: { left: 6 },
cornerRadius: 6,
color: foreground(layer, "variant"),
iconWidth: 12,
buttonWidth: 20,
active: {
background: background(layer, "variant", "active"),
color: foreground(layer, "variant", "active"),
},
hover: {
background: background(layer, "variant", "hovered"),
color: foreground(layer, "variant", "hovered"),
},
},
toggleContactsButton: { toggleContactsButton: {
margin: { left: 6 }, margin: { left: 6 },
cornerRadius: 6, cornerRadius: 6,