Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix minor issues with new collab UI
This commit is contained in:
Max Brunsfeld 2023-02-22 14:22:05 -08:00 • committed by GitHub
commit d49e35f947
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default.json
View file

@ -418,7 +418,7 @@
{ {
"bindings": { "bindings": {
"ctrl-alt-cmd-f": "workspace::FollowNextCollaborator", "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
"cmd-shift-c": "collab::ToggleCollaborationMenu", "cmd-shift-c": "collab::ToggleContactsMenu",
"cmd-alt-i": "zed::DebugElements" "cmd-alt-i": "zed::DebugElements"
} }
}, },

7
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -349,6 +349,13 @@ impl CollabTitlebarItem {
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ToggleContactsMenu); cx.dispatch_action(ToggleContactsMenu);
}) })
.with_tooltip::<ToggleContactsMenu, _>(
0,
"Show contacts menu".into(),
Some(Box::new(ToggleContactsMenu)),
theme.tooltip.clone(),
cx,
)
.aligned() .aligned()
.boxed(), .boxed(),
) )