From d33d27faa4f4de28f4913c117e935a8a9d2b102f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 22 Feb 2023 14:17:52 -0800 Subject: [PATCH 1/2] Fix ToggleContactsMenu action name in keymap Co-authored-by: Joseph Lyons --- assets/keymaps/default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json index e8f055cb7d..9ee9b1c941 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" } }, From 40aee8d7bc2d83e1042a3af83e2080ecfb440028 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 22 Feb 2023 14:18:17 -0800 Subject: [PATCH 2/2] Add missing tooltip for contacts menu button Co-authored-by: Joseph Lyons --- crates/collab_ui/src/collab_titlebar_item.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index e190deef84..061de78b9f 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(), )