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

title_bar: Fix screensharing errors not being shown to the user (#36424)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Lukas Wirth 2025-08-18 18:27:26 +02:00 • committed by GitHub
parent e1d8e3bf6d
commit ed155ceba9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

95
crates/title_bar/src/collab.rs
View file

@ -14,7 +14,6 @@ use ui::{
Avatar, AvatarAudioStatusIndicator, ContextMenu, ContextMenuItem, Divider, DividerColor, Avatar, AvatarAudioStatusIndicator, ContextMenu, ContextMenuItem, Divider, DividerColor,
Facepile, PopoverMenu, SplitButton, SplitButtonStyle, TintColor, Tooltip, prelude::*, Facepile, PopoverMenu, SplitButton, SplitButtonStyle, TintColor, Tooltip, prelude::*,
}; };
use util::maybe;
use workspace::notifications::DetachAndPromptErr; use workspace::notifications::DetachAndPromptErr;
use crate::TitleBar; use crate::TitleBar;
@ -32,52 +31,59 @@ actions!(
); );
fn toggle_screen_sharing( fn toggle_screen_sharing(
screen: Option<Rc<dyn ScreenCaptureSource>>, screen: anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>,
window: &mut Window, window: &mut Window,
cx: &mut App, cx: &mut App,
) { ) {
let call = ActiveCall::global(cx).read(cx); let call = ActiveCall::global(cx).read(cx);
if let Some(room) = call.room().cloned() { let toggle_screen_sharing = match screen {
let toggle_screen_sharing = room.update(cx, |room, cx| { Ok(screen) => {
let clicked_on_currently_shared_screen = let Some(room) = call.room().cloned() else {
room.shared_screen_id().is_some_and(|screen_id| { return;
Some(screen_id) };
== screen let toggle_screen_sharing = room.update(cx, |room, cx| {
.as_deref() let clicked_on_currently_shared_screen =
.and_then(|s| s.metadata().ok().map(|meta| meta.id)) room.shared_screen_id().is_some_and(|screen_id| {
}); Some(screen_id)
let should_unshare_current_screen = room.is_sharing_screen(); == screen
let unshared_current_screen = should_unshare_current_screen.then(|| { .as_deref()
telemetry::event!( .and_then(|s| s.metadata().ok().map(|meta| meta.id))
"Screen Share Disabled", });
room_id = room.id(), let should_unshare_current_screen = room.is_sharing_screen();
channel_id = room.channel_id(), let unshared_current_screen = should_unshare_current_screen.then(|| {
);
room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
});
if let Some(screen) = screen {
if !should_unshare_current_screen {
telemetry::event!( telemetry::event!(
"Screen Share Enabled", "Screen Share Disabled",
room_id = room.id(), room_id = room.id(),
channel_id = room.channel_id(), channel_id = room.channel_id(),
); );
} room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
cx.spawn(async move |room, cx| { });
unshared_current_screen.transpose()?; if let Some(screen) = screen {
if !clicked_on_currently_shared_screen { if !should_unshare_current_screen {
room.update(cx, |room, cx| room.share_screen(screen, cx))? telemetry::event!(
.await "Screen Share Enabled",
} else { room_id = room.id(),
Ok(()) channel_id = room.channel_id(),
);
} }
}) cx.spawn(async move |room, cx| {
} else { unshared_current_screen.transpose()?;
Task::ready(Ok(())) if !clicked_on_currently_shared_screen {
} room.update(cx, |room, cx| room.share_screen(screen, cx))?
}); .await
toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", window, cx, |e, _, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e))); } else {
} Ok(())
}
})
} else {
Task::ready(Ok(()))
}
});
toggle_screen_sharing
}
Err(e) => Task::ready(Err(e)),
};
toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", window, cx, |e, _, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
} }
fn toggle_mute(_: &ToggleMute, cx: &mut App) { fn toggle_mute(_: &ToggleMute, cx: &mut App) {
@ -483,9 +489,8 @@ impl TitleBar {
let screen = if should_share { let screen = if should_share {
cx.update(|_, cx| pick_default_screen(cx))?.await cx.update(|_, cx| pick_default_screen(cx))?.await
} else { } else {
None Ok(None)
}; };
cx.update(|window, cx| toggle_screen_sharing(screen, window, cx))?; cx.update(|window, cx| toggle_screen_sharing(screen, window, cx))?;
Result::<_, anyhow::Error>::Ok(()) Result::<_, anyhow::Error>::Ok(())
@ -571,7 +576,7 @@ impl TitleBar {
selectable: true, selectable: true,
documentation_aside: None, documentation_aside: None,
handler: Rc::new(move |_, window, cx| { handler: Rc::new(move |_, window, cx| {
toggle_screen_sharing(Some(screen.clone()), window, cx); toggle_screen_sharing(Ok(Some(screen.clone())), window, cx);
}), }),
}); });
} }
@ -585,11 +590,11 @@ impl TitleBar {
} }
/// Picks the screen to share when clicking on the main screen sharing button. /// Picks the screen to share when clicking on the main screen sharing button.
fn pick_default_screen(cx: &App) -> Task<Option<Rc<dyn ScreenCaptureSource>>> { fn pick_default_screen(cx: &App) -> Task<anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>> {
let source = cx.screen_capture_sources(); let source = cx.screen_capture_sources();
cx.spawn(async move |_| { cx.spawn(async move |_| {
let available_sources = maybe!(async move { source.await? }).await.ok()?; let available_sources = source.await??;
available_sources Ok(available_sources
.iter() .iter()
.find(|it| { .find(|it| {
it.as_ref() it.as_ref()
@ -597,6 +602,6 @@ fn pick_default_screen(cx: &App) -> Task<Option<Rc<dyn ScreenCaptureSource>>> {
.is_ok_and(|meta| meta.is_main.unwrap_or_default()) .is_ok_and(|meta| meta.is_main.unwrap_or_default())
}) })
.or_else(|| available_sources.iter().next()) .or_else(|| available_sources.iter().next())
.cloned() .cloned())
}) })
} }