From c58605a70cf985bd4b7a2b9a791488172a36d01f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 22 Feb 2023 14:22:05 -0800 Subject: [PATCH] Merge pull request #2203 from zed-industries/collab-ui-fixes Fix minor issues with new collab UI --- assets/keymaps/default.json | 2 +- crates/collab_ui/src/collab_titlebar_item.rs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json index e8f055cb7d740fc1ce15e88d496dce60a4b0ea6b..9ee9b1c94118c907265ca2214ed7b849babb1029 100644 --- a/assets/keymaps/default.json +++ b/assets/keymaps/default.json @@ -418,7 +418,7 @@ { "bindings": { "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator", - "cmd-shift-c": "collab::ToggleCollaborationMenu", + "cmd-shift-c": "collab::ToggleContactsMenu", "cmd-alt-i": "zed::DebugElements" } }, diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index e190deef84f4965af1dd2d94fe1be9963d1683ec..061de78b9f26909c6dadb728a3bd6120626c8a87 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -349,6 +349,13 @@ impl CollabTitlebarItem { .on_click(MouseButton::Left, move |_, cx| { cx.dispatch_action(ToggleContactsMenu); }) + .with_tooltip::( + 0, + "Show contacts menu".into(), + Some(Box::new(ToggleContactsMenu)), + theme.tooltip.clone(), + cx, + ) .aligned() .boxed(), )