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

Fix minor issues with new collab UI

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(),
             )

crates/rpc/src/rpc.rs

@@ -6,4 +6,4 @@ pub use conn::Connection;
 pub use peer::*;
 mod macros;
 
-pub const PROTOCOL_VERSION: u32 = 47;
+pub const PROTOCOL_VERSION: u32 = 48;

crates/zed/RELEASE_CHANNEL

@@ -1 +1 @@
-dev
+preview