mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Use theme colors for muted/speaking indicators

Browse source
This commit is contained in:
Nate Butler 2024-01-03 23:19:47 -05:00
parent 20a897d511
commit 77647fa088
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/assistant_panel.rs
View file

@ -1125,8 +1125,6 @@ impl Render for AssistantPanel {
.child(Label::new( .child(Label::new(
"Click on the Z button in the status bar to close this panel." "Click on the Z button in the status bar to close this panel."
)) ))
.border()
.border_color(gpui::red())
} else { } else {
let header = TabBar::new("assistant_header") let header = TabBar::new("assistant_header")
.start_child( .start_child(

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

@ -110,6 +110,7 @@ impl Render for CollabTitlebarItem {
&room, &room,
project_id, project_id,
&current_user, &current_user,
cx,
)) ))
.children( .children(
remote_participants.iter().filter_map(|collaborator| { remote_participants.iter().filter_map(|collaborator| {
@ -127,6 +128,7 @@ impl Render for CollabTitlebarItem {
&room, &room,
project_id, project_id,
&current_user, &current_user,
cx,
)?; )?;
Some( Some(
@ -405,6 +407,7 @@ impl CollabTitlebarItem {
room: &Room, room: &Room,
project_id: Option<u64>, project_id: Option<u64>,
current_user: &Arc<User>, current_user: &Arc<User>,
cx: &ViewContext<Self>,
) -> Option<FacePile> { ) -> Option<FacePile> {
let followers = project_id.map_or(&[] as &[_], |id| room.followers_for(peer_id, id)); let followers = project_id.map_or(&[] as &[_], |id| room.followers_for(peer_id, id));
@ -413,9 +416,9 @@ impl CollabTitlebarItem {
Avatar::new(user.avatar_uri.clone()) Avatar::new(user.avatar_uri.clone())
.grayscale(!is_present) .grayscale(!is_present)
.border_color(if is_speaking { .border_color(if is_speaking {
gpui::blue() cx.theme().status().info_border
} else if is_muted { } else if is_muted {
gpui::red() cx.theme().status().error_border
} else { } else {
Hsla::default() Hsla::default()
}), }),