Merge pull request #2203 from zed-industries/collab-ui-fixes

Max Brunsfeld created 2 years ago

Fix minor issues with new collab UI

Change summary

assets/keymaps/default.json                  | 2 +-
crates/collab_ui/src/collab_titlebar_item.rs | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)

Detailed changes

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"
         }
     },

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::<ToggleContactsMenu, _>(
+                    0,
+                    "Show contacts menu".into(),
+                    Some(Box::new(ToggleContactsMenu)),
+                    theme.tooltip.clone(),
+                    cx,
+                )
                 .aligned()
                 .boxed(),
             )