Allow clicking a titlebar avatar to initiate following

crates/gpui/src/app.rs

@@ -184,6 +184,12 @@ macro_rules! action {
                 Box::new(self.clone())
             }
         }
+
+        impl From<$arg> for $name {
+            fn from(arg: $arg) -> Self {
+                Self(arg)
+            }
+        }
     };
 
     ($name:ident) => {

crates/server/src/rpc.rs

@@ -4272,8 +4272,8 @@ mod tests {
         workspace_b
             .update(cx_b, |workspace, cx| {
                 workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx);
-                let leader_id = project_b.read(cx).collaborators().keys().next().unwrap();
+                let leader_id = *project_b.read(cx).collaborators().keys().next().unwrap();
-                workspace.follow(*leader_id, cx)
+                workspace.follow(&leader_id.into(), cx).unwrap()
             })
             .await
             .unwrap();
@@ -4291,8 +4291,7 @@ mod tests {
         });
         workspace_b
             .condition(cx_b, |workspace, cx| {
-                let active_item = workspace.active_item(cx).unwrap();
+                workspace.active_item(cx).unwrap().id() == editor_b1.id()
-                active_item.project_path(cx) == Some((worktree_id, "1.txt").into())
             })
             .await;
     }

crates/workspace/src/workspace.rs

@@ -43,7 +43,7 @@ use std::{
     sync::Arc,
 };
 use theme::{Theme, ThemeRegistry};
-use util::{ResultExt, TryFutureExt};
+use util::ResultExt;
 
 type ProjectItemBuilders = HashMap<
     TypeId,
@@ -68,6 +68,7 @@ action!(Open, Arc<AppState>);
 action!(OpenNew, Arc<AppState>);
 action!(OpenPaths, OpenParams);
 action!(ToggleShare);
+action!(FollowCollaborator, PeerId);
 action!(JoinProject, JoinProjectParams);
 action!(Save);
 action!(DebugElements);
@@ -88,6 +89,7 @@ pub fn init(client: &Arc<Client>, cx: &mut MutableAppContext) {
     });
 
     cx.add_action(Workspace::toggle_share);
+    cx.add_async_action(Workspace::follow);
     cx.add_action(
         |workspace: &mut Workspace, _: &Save, cx: &mut ViewContext<Workspace>| {
             workspace.save_active_item(cx).detach_and_log_err(cx);
@@ -1192,13 +1194,18 @@ impl Workspace {
         }
     }
 
-    pub fn follow(&mut self, leader_id: PeerId, cx: &mut ViewContext<Self>) -> Task<Result<()>> {
+    pub fn follow(
-        if let Some(project_id) = self.project.read(cx).remote_id() {
+        &mut self,
+        FollowCollaborator(leader_id): &FollowCollaborator,
+        cx: &mut ViewContext<Self>,
+    ) -> Option<Task<Result<()>>> {
+        let leader_id = *leader_id;
+        let project_id = self.project.read(cx).remote_id()?;
         let request = self.client.request(proto::Follow {
             project_id,
             leader_id: leader_id.0,
         });
-            cx.spawn_weak(|this, mut cx| async move {
+        Some(cx.spawn_weak(|this, mut cx| async move {
             let mut response = request.await?;
             if let Some(this) = this.upgrade(&cx) {
                 let mut item_tasks = Vec::new();
@@ -1270,10 +1277,7 @@ impl Workspace {
                 });
             }
             Ok(())
-            })
+        }))
-        } else {
-            Task::ready(Err(anyhow!("project is not remote")))
-        }
     }
 
     fn update_followers(
@@ -1383,7 +1387,9 @@ impl Workspace {
                 Some(self.render_avatar(
                     collaborator.user.avatar.clone()?,
                     collaborator.replica_id,
+                    Some(collaborator.peer_id),
                     theme,
+                    cx,
                 ))
             })
             .collect()
@@ -1397,7 +1403,7 @@ impl Workspace {
         cx: &mut RenderContext<Self>,
     ) -> ElementBox {
         if let Some(avatar) = user.and_then(|user| user.avatar.clone()) {
-            self.render_avatar(avatar, replica_id, theme)
+            self.render_avatar(avatar, replica_id, None, theme, cx)
         } else {
             MouseEventHandler::new::<Authenticate, _, _>(0, cx, |state, _| {
                 let style = if state.hovered {
@@ -1421,16 +1427,15 @@ impl Workspace {
         &self,
         avatar: Arc<ImageData>,
         replica_id: ReplicaId,
+        peer_id: Option<PeerId>,
         theme: &Theme,
+        cx: &mut RenderContext<Self>,
     ) -> ElementBox {
-        ConstrainedBox::new(
+        let content = Stack::new()
-            Stack::new()
             .with_child(
-                    ConstrainedBox::new(
                 Image::new(avatar)
                     .with_style(theme.workspace.titlebar.avatar)
-                            .boxed(),
+                    .constrained()
-                    )
                     .with_width(theme.workspace.titlebar.avatar_width)
                     .aligned()
                     .boxed(),
@@ -1444,27 +1449,37 @@ impl Workspace {
                     .bottom()
                     .boxed(),
             )
-                .boxed(),
+            .constrained()
-        )
             .with_width(theme.workspace.right_sidebar.width)
+            .boxed();
+
+        if let Some(peer_id) = peer_id {
+            MouseEventHandler::new::<FollowCollaborator, _, _>(
+                replica_id.into(),
+                cx,
+                move |_, _| content,
+            )
+            .with_cursor_style(CursorStyle::PointingHand)
+            .on_click(move |cx| cx.dispatch_action(FollowCollaborator(peer_id)))
             .boxed()
+        } else {
+            content
+        }
     }
 
     fn render_share_icon(&self, theme: &Theme, cx: &mut RenderContext<Self>) -> Option<ElementBox> {
         if self.project().read(cx).is_local() && self.client.user_id().is_some() {
-            enum Share {}
-
             let color = if self.project().read(cx).is_shared() {
                 theme.workspace.titlebar.share_icon_active_color
             } else {
                 theme.workspace.titlebar.share_icon_color
             };
             Some(
-                MouseEventHandler::new::<Share, _, _>(0, cx, |_, _| {
+                MouseEventHandler::new::<ToggleShare, _, _>(0, cx, |_, _| {
                     Align::new(
-                        ConstrainedBox::new(
+                        Svg::new("icons/broadcast-24.svg")
-                            Svg::new("icons/broadcast-24.svg").with_color(color).boxed(),
+                            .with_color(color)
-                        )
+                            .constrained()
                             .with_width(24.)
                             .boxed(),
                     )