mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Confirm on switching channels

Browse source
This commit is contained in:
Conrad Irwin 2023-10-03 13:41:24 -06:00
parent d696b394c4
commit 044fb9e2f5
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1662,7 +1662,7 @@ impl CollabPanel {
is_selected: bool, is_selected: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> AnyElement<Self> { ) -> AnyElement<Self> {
enum ContactTooltip {}; enum ContactTooltip {}
let collab_theme = &theme.collab_panel; let collab_theme = &theme.collab_panel;
let online = contact.online; let online = contact.online;
@ -1671,7 +1671,7 @@ impl CollabPanel {
let github_login = contact.user.github_login.clone(); let github_login = contact.user.github_login.clone();
let initial_project = project.clone(); let initial_project = project.clone();
let mut event_handler = let event_handler =
MouseEventHandler::new::<Contact, _>(contact.user.id as usize, cx, |state, cx| { MouseEventHandler::new::<Contact, _>(contact.user.id as usize, cx, |state, cx| {
Flex::row() Flex::row()
.with_children(contact.user.avatar.clone().map(|avatar| { .with_children(contact.user.avatar.clone().map(|avatar| {
@ -3127,11 +3127,28 @@ impl CollabPanel {
} }
fn join_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) { fn join_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
let join = ActiveCall::global(cx).update(cx, |call, cx| call.join_channel(channel_id, cx));
let workspace = self.workspace.clone(); let workspace = self.workspace.clone();
let window = cx.window();
let active_call = ActiveCall::global(cx);
cx.spawn(|_, mut cx| async move { cx.spawn(|_, mut cx| async move {
let room = join.await?; if active_call.read_with(&mut cx, |active_call, _| active_call.room().is_some()) {
let answer = window.prompt(
PromptLevel::Warning,
"Do you want to leave the current call?",
&["Yes, Join Channel", "Cancel"],
&mut cx,
);
if let Some(mut answer) = answer {
if answer.next().await == Some(1) {
return anyhow::Ok(());
}
}
}
let room = active_call
.update(&mut cx, |call, cx| call.join_channel(channel_id, cx))
.await?;
let tasks = room.update(&mut cx, |room, cx| { let tasks = room.update(&mut cx, |room, cx| {
let Some(workspace) = workspace.upgrade(cx) else { let Some(workspace) = workspace.upgrade(cx) else {
@ -3154,7 +3171,7 @@ impl CollabPanel {
for task in tasks { for task in tasks {
task.await?; task.await?;
} }
Ok::<(), anyhow::Error>(()) anyhow::Ok(())
}) })
.detach_and_log_err(cx); .detach_and_log_err(cx);
} }