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

Merge branch 'main' into collab-panel

Browse source
This commit is contained in:
Mikayla 2023-08-12 12:44:22 -07:00
commit a90c0e0326
No known key found for this signature in database
30 changed files with 410 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/collab_ui/src/collab_panel.rs
View file

@ -988,7 +988,7 @@ impl CollabPanel {
),
background: Some(tree_branch.color),
border: gpui::Border::default(),
corner_radius: 0.,
corner_radii: (0.).into(),
});
scene.push_quad(gpui::Quad {
bounds: RectF::from_points(
@ -997,7 +997,7 @@ impl CollabPanel {
),
background: Some(tree_branch.color),
border: gpui::Border::default(),
corner_radius: 0.,
corner_radii: (0.).into(),
});
}))
.constrained()
@ -1085,7 +1085,7 @@ impl CollabPanel {
),
background: Some(tree_branch.color),
border: gpui::Border::default(),
corner_radius: 0.,
corner_radii: (0.).into(),
});
scene.push_quad(gpui::Quad {
bounds: RectF::from_points(
@ -1094,7 +1094,7 @@ impl CollabPanel {
),
background: Some(tree_branch.color),
border: gpui::Border::default(),
corner_radius: 0.,
corner_radii: (0.).into(),
});
}))
.constrained()
@ -1188,7 +1188,7 @@ impl CollabPanel {
})
.with_tooltip::<AddContact>(
0,
"Leave call".into(),
"Leave call",
None,
tooltip_style.clone(),
cx,
@ -1210,7 +1210,7 @@ impl CollabPanel {
})
.with_tooltip::<LeaveCallContactList>(
0,
"Search for new contact".into(),
"Search for new contact",
None,
tooltip_style.clone(),
cx,
@ -1230,7 +1230,7 @@ impl CollabPanel {
.on_click(MouseButton::Left, |_, this, cx| this.new_root_channel(cx))
.with_tooltip::<AddChannel>(
0,
"Add or join a channel".into(),
"Add or join a channel",
None,
tooltip_style.clone(),
cx,

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

@ -231,7 +231,7 @@ impl CollabTitlebarItem {
.left()
.with_tooltip::<RecentProjectsTooltip>(
0,
"Recent projects".into(),
"Recent projects",
Some(Box::new(recent_projects::OpenRecent)),
theme.tooltip.clone(),
cx,
@ -275,7 +275,7 @@ impl CollabTitlebarItem {
.left()
.with_tooltip::<BranchPopoverTooltip>(
0,
"Recent branches".into(),
"Recent branches",
Some(Box::new(ToggleVcsMenu)),
theme.tooltip.clone(),
cx,
@ -528,7 +528,7 @@ impl CollabTitlebarItem {
})
.with_tooltip::<ToggleScreenSharing>(
0,
tooltip.into(),
tooltip,
Some(Box::new(ToggleScreenSharing)),
theme.tooltip.clone(),
cx,
@ -581,7 +581,7 @@ impl CollabTitlebarItem {
})
.with_tooltip::<ToggleMute>(
0,
tooltip.into(),
tooltip,
Some(Box::new(ToggleMute)),
theme.tooltip.clone(),
cx,
@ -629,7 +629,7 @@ impl CollabTitlebarItem {
})
.with_tooltip::<ToggleDeafen>(
0,
tooltip.into(),
tooltip,
Some(Box::new(ToggleDeafen)),
theme.tooltip.clone(),
cx,
@ -663,7 +663,7 @@ impl CollabTitlebarItem {
})
.with_tooltip::<LeaveCall>(
0,
tooltip.into(),
tooltip,
Some(Box::new(LeaveCall)),
theme.tooltip.clone(),
cx,