Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add color ribbon for local player (#4075)

Browse source 
This PR adds a color ribbon for the local player in the current call.

This fixes the alignment of the local user's avatar so that it lines up
with the rest of the collaborators in the call:

<img width="307" alt="Screenshot 2024-01-16 at 2 56 04 PM"
src="https://github.com/zed-industries/zed/assets/1486634/979ee3fa-70c9-482a-9351-020402ad68b9">

Release Notes:

- Added a color ribbon for the local player when in a call.
This commit is contained in:
Marshall Bowers 2024-01-16 15:17:29 -05:00 • committed by GitHub
parent ff67d9dea0
commit 9903b7ae6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use crate::face_pile::FacePile; use crate::face_pile::FacePile;
use auto_update::AutoUpdateStatus; use auto_update::AutoUpdateStatus;
use call::{ActiveCall, ParticipantLocation, Room}; use call::{ActiveCall, ParticipantLocation, Room};
use client::{proto::PeerId, Client, ParticipantIndex, User, UserStore}; use client::{proto::PeerId, Client, User, UserStore};
use gpui::{ use gpui::{
actions, canvas, div, point, px, rems, Action, AnyElement, AppContext, Element, Hsla, actions, canvas, div, point, px, rems, Action, AnyElement, AppContext, Element, Hsla,
InteractiveElement, IntoElement, Model, ParentElement, Path, Render, InteractiveElement, IntoElement, Model, ParentElement, Path, Render,
@ -12,7 +12,7 @@ use project::{Project, RepositoryEntry};
use recent_projects::RecentProjects; use recent_projects::RecentProjects;
use rpc::proto; use rpc::proto;
use std::sync::Arc; use std::sync::Arc;
use theme::{ActiveTheme, PlayerColors}; use theme::ActiveTheme;
use ui::{ use ui::{
h_flex, popover_menu, prelude::*, Avatar, Button, ButtonLike, ButtonStyle, ContextMenu, Icon, h_flex, popover_menu, prelude::*, Avatar, Button, ButtonLike, ButtonStyle, ContextMenu, Icon,
IconButton, IconName, TintColor, Tooltip, IconButton, IconName, TintColor, Tooltip,
@ -97,7 +97,7 @@ impl Render for CollabTitlebarItem {
room.remote_participants().values().collect::<Vec<_>>(); room.remote_participants().values().collect::<Vec<_>>();
remote_participants.sort_by_key(|p| p.participant_index.0); remote_participants.sort_by_key(|p| p.participant_index.0);
this.children(self.render_collaborator( let current_user_face_pile = self.render_collaborator(
&current_user, &current_user,
peer_id, peer_id,
true, true,
@ -107,7 +107,13 @@ impl Render for CollabTitlebarItem {
project_id, project_id,
&current_user, &current_user,
cx, cx,
)) );
this.children(current_user_face_pile.map(|face_pile| {
v_flex()
.child(face_pile)
.child(render_color_ribbon(player_colors.local().cursor))
}))
.children( .children(
remote_participants.iter().filter_map(|collaborator| { remote_participants.iter().filter_map(|collaborator| {
let is_present = project_id.map_or(false, |project_id| { let is_present = project_id.map_or(false, |project_id| {
@ -132,8 +138,11 @@ impl Render for CollabTitlebarItem {
.id(("collaborator", collaborator.user.id)) .id(("collaborator", collaborator.user.id))
.child(face_pile) .child(face_pile)
.child(render_color_ribbon( .child(render_color_ribbon(
collaborator.participant_index, player_colors
player_colors, .color_for_participant(
collaborator.participant_index.0,
)
.cursor,
)) ))
.cursor_pointer() .cursor_pointer()
.on_click({ .on_click({
@ -312,8 +321,7 @@ impl Render for CollabTitlebarItem {
} }
} }
fn render_color_ribbon(participant_index: ParticipantIndex, colors: &PlayerColors) -> gpui::Canvas { fn render_color_ribbon(color: Hsla) -> gpui::Canvas {
let color = colors.color_for_participant(participant_index.0).cursor;
canvas(move |bounds, cx| { canvas(move |bounds, cx| {
let height = bounds.size.height; let height = bounds.size.height;
let horizontal_offset = height; let horizontal_offset = height;