Anthony EidandRemco Smits
d5421ba1a8
On Windows, clicking on a collab user icon in the title bar would minimize/expand Zed because the click would bleed through to the title bar. This PR fixes this by stopping propagation. #### Before (On MacOS with double clicks to mimic the same behavior) https://github.com/user-attachments/assets/5a91f7ff-265a-4575-aa23-00b8d30daeed #### After (On MacOS with double clicks to mimic the same behavior) https://github.com/user-attachments/assets/e9fcb98f-4855-4f21-8926-2d306d256f1c Release Notes: - Windows: Fix clicking on user icon in title bar to follow minimizing/expanding Zed Co-authored-by: Remco Smits <djsmits12@gmail.com>
637 lines
26 KiB
Rust
637 lines
26 KiB
Rust
use std::rc::Rc;
|
||
use std::sync::Arc;
|
||
|
||
use call::{ActiveCall, ParticipantLocation, Room};
|
||
use channel::ChannelStore;
|
||
use client::{User, proto::PeerId};
|
||
use gpui::{
|
||
AnyElement, Hsla, IntoElement, MouseButton, Path, ScreenCaptureSource, Styled, WeakEntity,
|
||
canvas, point,
|
||
};
|
||
use gpui::{App, Task, Window, actions};
|
||
use project::WorktreeSettings;
|
||
use rpc::proto::{self};
|
||
use settings::{Settings as _, SettingsLocation};
|
||
use theme::ActiveTheme;
|
||
use ui::{
|
||
Avatar, AvatarAudioStatusIndicator, ContextMenu, ContextMenuItem, Divider, DividerColor,
|
||
Facepile, PopoverMenu, SplitButton, SplitButtonStyle, TintColor, Tooltip, prelude::*,
|
||
};
|
||
use util::rel_path::RelPath;
|
||
use workspace::notifications::DetachAndPromptErr;
|
||
|
||
use crate::TitleBar;
|
||
|
||
actions!(
|
||
collab,
|
||
[
|
||
/// Toggles screen sharing on or off.
|
||
ToggleScreenSharing,
|
||
/// Toggles microphone mute.
|
||
ToggleMute,
|
||
/// Toggles deafen mode (mute both microphone and speakers).
|
||
ToggleDeafen
|
||
]
|
||
);
|
||
|
||
fn toggle_screen_sharing(
|
||
screen: anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>,
|
||
window: &mut Window,
|
||
cx: &mut App,
|
||
) {
|
||
let call = ActiveCall::global(cx).read(cx);
|
||
let toggle_screen_sharing = match screen {
|
||
Ok(screen) => {
|
||
let Some(room) = call.room().cloned() else {
|
||
return;
|
||
};
|
||
|
||
room.update(cx, |room, cx| {
|
||
let clicked_on_currently_shared_screen =
|
||
room.shared_screen_id().is_some_and(|screen_id| {
|
||
Some(screen_id)
|
||
== screen
|
||
.as_deref()
|
||
.and_then(|s| s.metadata().ok().map(|meta| meta.id))
|
||
});
|
||
let should_unshare_current_screen = room.is_sharing_screen();
|
||
let unshared_current_screen = should_unshare_current_screen.then(|| {
|
||
telemetry::event!(
|
||
"Screen Share Disabled",
|
||
room_id = room.id(),
|
||
channel_id = room.channel_id(),
|
||
);
|
||
room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
|
||
});
|
||
if let Some(screen) = screen {
|
||
if !should_unshare_current_screen {
|
||
telemetry::event!(
|
||
"Screen Share Enabled",
|
||
room_id = room.id(),
|
||
channel_id = room.channel_id(),
|
||
);
|
||
}
|
||
cx.spawn(async move |room, cx| {
|
||
unshared_current_screen.transpose()?;
|
||
if !clicked_on_currently_shared_screen {
|
||
room.update(cx, |room, cx| room.share_screen(screen, cx))?
|
||
.await
|
||
} else {
|
||
Ok(())
|
||
}
|
||
})
|
||
} else {
|
||
Task::ready(Ok(()))
|
||
}
|
||
})
|
||
}
|
||
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) {
|
||
let call = ActiveCall::global(cx).read(cx);
|
||
if let Some(room) = call.room().cloned() {
|
||
room.update(cx, |room, cx| {
|
||
let operation = if room.is_muted() {
|
||
"Microphone Enabled"
|
||
} else {
|
||
"Microphone Disabled"
|
||
};
|
||
telemetry::event!(
|
||
operation,
|
||
room_id = room.id(),
|
||
channel_id = room.channel_id(),
|
||
);
|
||
|
||
room.toggle_mute(cx)
|
||
});
|
||
}
|
||
}
|
||
|
||
fn toggle_deafen(_: &ToggleDeafen, cx: &mut App) {
|
||
if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
|
||
room.update(cx, |room, cx| room.toggle_deafen(cx));
|
||
}
|
||
}
|
||
|
||
fn render_color_ribbon(color: Hsla) -> impl Element {
|
||
canvas(
|
||
move |_, _, _| {},
|
||
move |bounds, _, window, _| {
|
||
let height = bounds.size.height;
|
||
let horizontal_offset = height;
|
||
let vertical_offset = height / 2.0;
|
||
let mut path = Path::new(bounds.bottom_left());
|
||
path.curve_to(
|
||
bounds.origin + point(horizontal_offset, vertical_offset),
|
||
bounds.origin + point(px(0.0), vertical_offset),
|
||
);
|
||
path.line_to(bounds.top_right() + point(-horizontal_offset, vertical_offset));
|
||
path.curve_to(
|
||
bounds.bottom_right(),
|
||
bounds.top_right() + point(px(0.0), vertical_offset),
|
||
);
|
||
path.line_to(bounds.bottom_left());
|
||
window.paint_path(path, color);
|
||
},
|
||
)
|
||
.h_1()
|
||
.w_full()
|
||
}
|
||
|
||
impl TitleBar {
|
||
pub(crate) fn render_collaborator_list(
|
||
&self,
|
||
_: &mut Window,
|
||
cx: &mut Context<Self>,
|
||
) -> impl IntoElement {
|
||
let room = ActiveCall::global(cx).read(cx).room().cloned();
|
||
let current_user = self.user_store.read(cx).current_user();
|
||
let client = self.client.clone();
|
||
let project_id = self.project.read(cx).remote_id();
|
||
let workspace = self.workspace.upgrade();
|
||
|
||
h_flex()
|
||
.id("collaborator-list")
|
||
.w_full()
|
||
.gap_1()
|
||
.overflow_x_scroll()
|
||
.when_some(
|
||
current_user.zip(client.peer_id()).zip(room),
|
||
|this, ((current_user, peer_id), room)| {
|
||
let player_colors = cx.theme().players();
|
||
let room = room.read(cx);
|
||
let mut remote_participants =
|
||
room.remote_participants().values().collect::<Vec<_>>();
|
||
remote_participants.sort_by_key(|p| p.participant_index.0);
|
||
|
||
let current_user_face_pile = self.render_collaborator(
|
||
¤t_user,
|
||
peer_id,
|
||
true,
|
||
room.is_speaking(),
|
||
room.is_muted(),
|
||
None,
|
||
room,
|
||
project_id,
|
||
¤t_user,
|
||
cx,
|
||
);
|
||
|
||
this.children(current_user_face_pile.map(|face_pile| {
|
||
v_flex()
|
||
.on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
|
||
.child(face_pile)
|
||
.child(render_color_ribbon(player_colors.local().cursor))
|
||
}))
|
||
.children(remote_participants.iter().filter_map(|collaborator| {
|
||
let player_color =
|
||
player_colors.color_for_participant(collaborator.participant_index.0);
|
||
let is_following = workspace
|
||
.as_ref()?
|
||
.read(cx)
|
||
.is_being_followed(collaborator.peer_id);
|
||
let is_present = project_id.is_some_and(|project_id| {
|
||
collaborator.location
|
||
== ParticipantLocation::SharedProject { project_id }
|
||
});
|
||
|
||
let facepile = self.render_collaborator(
|
||
&collaborator.user,
|
||
collaborator.peer_id,
|
||
is_present,
|
||
collaborator.speaking,
|
||
collaborator.muted,
|
||
is_following.then_some(player_color.selection),
|
||
room,
|
||
project_id,
|
||
¤t_user,
|
||
cx,
|
||
)?;
|
||
|
||
Some(
|
||
v_flex()
|
||
.id(("collaborator", collaborator.user.id))
|
||
.child(facepile)
|
||
.child(render_color_ribbon(player_color.cursor))
|
||
.cursor_pointer()
|
||
.on_click({
|
||
let peer_id = collaborator.peer_id;
|
||
cx.listener(move |this, _, window, cx| {
|
||
cx.stop_propagation();
|
||
|
||
this.workspace
|
||
.update(cx, |workspace, cx| {
|
||
if is_following {
|
||
workspace.unfollow(peer_id, window, cx);
|
||
} else {
|
||
workspace.follow(peer_id, window, cx);
|
||
}
|
||
})
|
||
.ok();
|
||
})
|
||
})
|
||
.tooltip({
|
||
let login = collaborator.user.github_login.clone();
|
||
Tooltip::text(format!("Follow {login}"))
|
||
}),
|
||
)
|
||
}))
|
||
},
|
||
)
|
||
}
|
||
|
||
fn render_collaborator(
|
||
&self,
|
||
user: &Arc<User>,
|
||
peer_id: PeerId,
|
||
is_present: bool,
|
||
is_speaking: bool,
|
||
is_muted: bool,
|
||
leader_selection_color: Option<Hsla>,
|
||
room: &Room,
|
||
project_id: Option<u64>,
|
||
current_user: &Arc<User>,
|
||
cx: &App,
|
||
) -> Option<Div> {
|
||
if room.role_for_user(user.id) == Some(proto::ChannelRole::Guest) {
|
||
return None;
|
||
}
|
||
|
||
const FACEPILE_LIMIT: usize = 3;
|
||
let followers = project_id.map_or(&[] as &[_], |id| room.followers_for(peer_id, id));
|
||
let extra_count = followers.len().saturating_sub(FACEPILE_LIMIT);
|
||
|
||
Some(
|
||
div()
|
||
.m_0p5()
|
||
.p_0p5()
|
||
// When the collaborator is not followed, still draw this wrapper div, but leave
|
||
// it transparent, so that it does not shift the layout when following.
|
||
.when_some(leader_selection_color, |div, color| {
|
||
div.rounded_sm().bg(color)
|
||
})
|
||
.child(
|
||
Facepile::empty()
|
||
.child(
|
||
Avatar::new(user.avatar_uri.clone())
|
||
.grayscale(!is_present)
|
||
.border_color(if is_speaking {
|
||
cx.theme().status().info
|
||
} else {
|
||
// We draw the border in a transparent color rather to avoid
|
||
// the layout shift that would come with adding/removing the border.
|
||
gpui::transparent_black()
|
||
})
|
||
.when(is_muted, |avatar| {
|
||
avatar.indicator(
|
||
AvatarAudioStatusIndicator::new(ui::AudioStatus::Muted)
|
||
.tooltip({
|
||
let github_login = user.github_login.clone();
|
||
Tooltip::text(format!("{} is muted", github_login))
|
||
}),
|
||
)
|
||
}),
|
||
)
|
||
.children(followers.iter().take(FACEPILE_LIMIT).filter_map(
|
||
|follower_peer_id| {
|
||
let follower = room
|
||
.remote_participants()
|
||
.values()
|
||
.find_map(|p| {
|
||
(p.peer_id == *follower_peer_id).then_some(&p.user)
|
||
})
|
||
.or_else(|| {
|
||
(self.client.peer_id() == Some(*follower_peer_id))
|
||
.then_some(current_user)
|
||
})?
|
||
.clone();
|
||
|
||
Some(div().mt(-px(4.)).child(
|
||
Avatar::new(follower.avatar_uri.clone()).size(rems(0.75)),
|
||
))
|
||
},
|
||
))
|
||
.children(if extra_count > 0 {
|
||
Some(
|
||
Label::new(format!("+{extra_count}"))
|
||
.ml_1()
|
||
.into_any_element(),
|
||
)
|
||
} else {
|
||
None
|
||
}),
|
||
),
|
||
)
|
||
}
|
||
|
||
pub(crate) fn render_call_controls(
|
||
&self,
|
||
window: &mut Window,
|
||
cx: &mut Context<Self>,
|
||
) -> Vec<AnyElement> {
|
||
let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
|
||
return Vec::new();
|
||
};
|
||
|
||
let is_connecting_to_project = self
|
||
.workspace
|
||
.update(cx, |workspace, cx| workspace.has_active_modal(window, cx))
|
||
.unwrap_or(false);
|
||
|
||
let room = room.read(cx);
|
||
let project = self.project.read(cx);
|
||
let is_local = project.is_local() || project.is_via_remote_server();
|
||
let is_shared = is_local && project.is_shared();
|
||
let is_muted = room.is_muted();
|
||
let muted_by_user = room.muted_by_user();
|
||
let is_deafened = room.is_deafened().unwrap_or(false);
|
||
let is_screen_sharing = room.is_sharing_screen();
|
||
let can_use_microphone = room.can_use_microphone();
|
||
let can_share_projects = room.can_share_projects();
|
||
let screen_sharing_supported = cx.is_screen_capture_supported();
|
||
|
||
let channel_store = ChannelStore::global(cx);
|
||
let channel = room
|
||
.channel_id()
|
||
.and_then(|channel_id| channel_store.read(cx).channel_for_id(channel_id).cloned());
|
||
|
||
let mut children = Vec::new();
|
||
|
||
children.push(
|
||
h_flex()
|
||
.gap_1()
|
||
.child(
|
||
IconButton::new("leave-call", IconName::Exit)
|
||
.style(ButtonStyle::Subtle)
|
||
.tooltip(Tooltip::text("Leave Call"))
|
||
.icon_size(IconSize::Small)
|
||
.on_click(move |_, _window, cx| {
|
||
ActiveCall::global(cx)
|
||
.update(cx, |call, cx| call.hang_up(cx))
|
||
.detach_and_log_err(cx);
|
||
}),
|
||
)
|
||
.child(Divider::vertical().color(DividerColor::Border))
|
||
.into_any_element(),
|
||
);
|
||
|
||
if is_local && can_share_projects && !is_connecting_to_project {
|
||
let is_sharing_disabled = channel.is_some_and(|channel| match channel.visibility {
|
||
proto::ChannelVisibility::Public => project.visible_worktrees(cx).any(|worktree| {
|
||
let worktree_id = worktree.read(cx).id();
|
||
|
||
let settings_location = Some(SettingsLocation {
|
||
worktree_id,
|
||
path: RelPath::empty(),
|
||
});
|
||
|
||
WorktreeSettings::get(settings_location, cx).prevent_sharing_in_public_channels
|
||
}),
|
||
proto::ChannelVisibility::Members => false,
|
||
});
|
||
|
||
children.push(
|
||
Button::new(
|
||
"toggle_sharing",
|
||
if is_shared { "Unshare" } else { "Share" },
|
||
)
|
||
.tooltip(Tooltip::text(if is_shared {
|
||
"Stop sharing project with call participants"
|
||
} else {
|
||
"Share project with call participants"
|
||
}))
|
||
.style(ButtonStyle::Subtle)
|
||
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
|
||
.toggle_state(is_shared)
|
||
.label_size(LabelSize::Small)
|
||
.when(is_sharing_disabled, |parent| {
|
||
parent.disabled(true).tooltip(Tooltip::text(
|
||
"This project may not be shared in a public channel.",
|
||
))
|
||
})
|
||
.on_click(cx.listener(move |this, _, window, cx| {
|
||
if is_shared {
|
||
this.unshare_project(window, cx);
|
||
} else {
|
||
this.share_project(cx);
|
||
}
|
||
}))
|
||
.into_any_element(),
|
||
);
|
||
}
|
||
|
||
if can_use_microphone {
|
||
children.push(
|
||
IconButton::new(
|
||
"mute-microphone",
|
||
if is_muted {
|
||
IconName::MicMute
|
||
} else {
|
||
IconName::Mic
|
||
},
|
||
)
|
||
.tooltip(move |_window, cx| {
|
||
if is_muted {
|
||
if is_deafened {
|
||
Tooltip::with_meta(
|
||
"Unmute Microphone",
|
||
None,
|
||
"Audio will be unmuted",
|
||
cx,
|
||
)
|
||
} else {
|
||
Tooltip::simple("Unmute Microphone", cx)
|
||
}
|
||
} else {
|
||
Tooltip::simple("Mute Microphone", cx)
|
||
}
|
||
})
|
||
.style(ButtonStyle::Subtle)
|
||
.icon_size(IconSize::Small)
|
||
.toggle_state(is_muted)
|
||
.selected_style(ButtonStyle::Tinted(TintColor::Error))
|
||
.on_click(move |_, _window, cx| {
|
||
toggle_mute(&Default::default(), cx);
|
||
})
|
||
.into_any_element(),
|
||
);
|
||
}
|
||
|
||
children.push(
|
||
IconButton::new(
|
||
"mute-sound",
|
||
if is_deafened {
|
||
IconName::AudioOff
|
||
} else {
|
||
IconName::AudioOn
|
||
},
|
||
)
|
||
.style(ButtonStyle::Subtle)
|
||
.selected_style(ButtonStyle::Tinted(TintColor::Error))
|
||
.icon_size(IconSize::Small)
|
||
.toggle_state(is_deafened)
|
||
.tooltip(move |_window, cx| {
|
||
if is_deafened {
|
||
let label = "Unmute Audio";
|
||
|
||
if !muted_by_user {
|
||
Tooltip::with_meta(label, None, "Microphone will be unmuted", cx)
|
||
} else {
|
||
Tooltip::simple(label, cx)
|
||
}
|
||
} else {
|
||
let label = "Mute Audio";
|
||
|
||
if !muted_by_user {
|
||
Tooltip::with_meta(label, None, "Microphone will be muted", cx)
|
||
} else {
|
||
Tooltip::simple(label, cx)
|
||
}
|
||
}
|
||
})
|
||
.on_click(move |_, _, cx| toggle_deafen(&Default::default(), cx))
|
||
.into_any_element(),
|
||
);
|
||
|
||
if can_use_microphone && screen_sharing_supported {
|
||
let trigger = IconButton::new("screen-share", IconName::Screen)
|
||
.style(ButtonStyle::Subtle)
|
||
.icon_size(IconSize::Small)
|
||
.toggle_state(is_screen_sharing)
|
||
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
|
||
.tooltip(Tooltip::text(if is_screen_sharing {
|
||
"Stop Sharing Screen"
|
||
} else {
|
||
"Share Screen"
|
||
}))
|
||
.on_click(move |_, window, cx| {
|
||
let should_share = ActiveCall::global(cx)
|
||
.read(cx)
|
||
.room()
|
||
.is_some_and(|room| !room.read(cx).is_sharing_screen());
|
||
|
||
window
|
||
.spawn(cx, async move |cx| {
|
||
let screen = if should_share {
|
||
cx.update(|_, cx| pick_default_screen(cx))?.await
|
||
} else {
|
||
Ok(None)
|
||
};
|
||
cx.update(|window, cx| toggle_screen_sharing(screen, window, cx))?;
|
||
|
||
Result::<_, anyhow::Error>::Ok(())
|
||
})
|
||
.detach();
|
||
});
|
||
|
||
children.push(
|
||
SplitButton::new(
|
||
trigger.render(window, cx),
|
||
self.render_screen_list().into_any_element(),
|
||
)
|
||
.style(SplitButtonStyle::Transparent)
|
||
.into_any_element(),
|
||
);
|
||
}
|
||
|
||
children.push(div().pr_2().into_any_element());
|
||
|
||
children
|
||
}
|
||
|
||
fn render_screen_list(&self) -> impl IntoElement {
|
||
PopoverMenu::new("screen-share-screen-list")
|
||
.with_handle(self.screen_share_popover_handle.clone())
|
||
.trigger(
|
||
ui::ButtonLike::new_rounded_right("screen-share-screen-list-trigger")
|
||
.child(
|
||
h_flex()
|
||
.mx_neg_0p5()
|
||
.h_full()
|
||
.justify_center()
|
||
.child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
|
||
)
|
||
.toggle_state(self.screen_share_popover_handle.is_deployed()),
|
||
)
|
||
.menu(|window, cx| {
|
||
let screens = cx.screen_capture_sources();
|
||
Some(ContextMenu::build(window, cx, |context_menu, _, cx| {
|
||
cx.spawn(async move |this: WeakEntity<ContextMenu>, cx| {
|
||
let screens = screens.await??;
|
||
this.update(cx, |this, cx| {
|
||
let active_screenshare_id = ActiveCall::global(cx)
|
||
.read(cx)
|
||
.room()
|
||
.and_then(|room| room.read(cx).shared_screen_id());
|
||
for screen in screens {
|
||
let Ok(meta) = screen.metadata() else {
|
||
continue;
|
||
};
|
||
|
||
let label = meta
|
||
.label
|
||
.clone()
|
||
.unwrap_or_else(|| SharedString::from("Unknown screen"));
|
||
let resolution = SharedString::from(format!(
|
||
"{} × {}",
|
||
meta.resolution.width.0, meta.resolution.height.0
|
||
));
|
||
this.push_item(ContextMenuItem::CustomEntry {
|
||
entry_render: Box::new(move |_, _| {
|
||
h_flex()
|
||
.gap_2()
|
||
.child(
|
||
Icon::new(IconName::Screen)
|
||
.size(IconSize::XSmall)
|
||
.map(|this| {
|
||
if active_screenshare_id == Some(meta.id) {
|
||
this.color(Color::Accent)
|
||
} else {
|
||
this.color(Color::Muted)
|
||
}
|
||
}),
|
||
)
|
||
.child(Label::new(label.clone()))
|
||
.child(
|
||
Label::new(resolution.clone())
|
||
.color(Color::Muted)
|
||
.size(LabelSize::Small),
|
||
)
|
||
.into_any()
|
||
}),
|
||
selectable: true,
|
||
documentation_aside: None,
|
||
handler: Rc::new(move |_, window, cx| {
|
||
toggle_screen_sharing(Ok(Some(screen.clone())), window, cx);
|
||
}),
|
||
});
|
||
}
|
||
})
|
||
})
|
||
.detach_and_log_err(cx);
|
||
context_menu
|
||
}))
|
||
})
|
||
}
|
||
}
|
||
|
||
/// Picks the screen to share when clicking on the main screen sharing button.
|
||
fn pick_default_screen(cx: &App) -> Task<anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>> {
|
||
let source = cx.screen_capture_sources();
|
||
cx.spawn(async move |_| {
|
||
let available_sources = source.await??;
|
||
Ok(available_sources
|
||
.iter()
|
||
.find(|it| {
|
||
it.as_ref()
|
||
.metadata()
|
||
.is_ok_and(|meta| meta.is_main.unwrap_or_default())
|
||
})
|
||
.or_else(|| available_sources.first())
|
||
.cloned())
|
||
})
|
||
}
|