From c1919438494b181ee812a6fd7992d0a355add5e9 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:00:13 +0100 Subject: [PATCH 01/19] Add basic call/user UI in top-right corner. Allow ui::Avatar to take custom data instead of always relying on URI resolution --- crates/collab_ui2/src/collab_titlebar_item.rs | 45 +++++++++- crates/gpui2/src/elements/img.rs | 86 +++++++++++++------ crates/ui2/src/components/avatar.rs | 8 +- crates/ui2/src/components/stories/avatar.rs | 4 +- crates/util/src/channel.rs | 2 +- crates/workspace2/src/workspace2.rs | 4 + 6 files changed, 113 insertions(+), 36 deletions(-) diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 94db2f4d9f..d9eff16e8e 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -37,7 +37,7 @@ use gpui::{ }; use project::Project; use theme::ActiveTheme; -use ui::{h_stack, Button, ButtonVariant, Color, KeyBinding, Label, Tooltip}; +use ui::{h_stack, Button, ButtonVariant, Color, IconButton, KeyBinding, Tooltip}; use workspace::Workspace; // const MAX_PROJECT_NAME_LENGTH: usize = 40; @@ -85,6 +85,13 @@ impl Render for CollabTitlebarItem { type Element = Stateful
; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + let is_in_room = self + .workspace + .update(cx, |this, cx| this.call_state().is_in_room(cx)) + .unwrap_or_default(); + let is_shared = is_in_room && self.project.read(cx).is_shared(); + let current_user = self.user_store.read(cx).current_user(); + let client = self.client.clone(); h_stack() .id("titlebar") .justify_between() @@ -149,8 +156,40 @@ impl Render for CollabTitlebarItem { .into() }), ), - ) // self.titlebar_item - .child(h_stack().child(Label::new("Right side titlebar item"))) + ) + .map(|this| { + if let Some(user) = current_user { + this.when_some(user.avatar.clone(), |this, avatar| { + this.child(ui::Avatar::new(avatar)) + }) + } else { + this.child(Button::new("Sign in").on_click(move |_, cx| { + let client = client.clone(); + cx.spawn(move |cx| async move { + client.authenticate_and_connect(true, &cx).await?; + Ok::<(), anyhow::Error>(()) + }) + .detach_and_log_err(cx); + })) + } + }) // that's obviously wrong as we should check for current call,not current user + .when(is_in_room, |this| { + this.child( + h_stack() + .child( + h_stack() + .child(Button::new(if is_shared { "Unshare" } else { "Share" })) + .child(IconButton::new("leave-call", ui::Icon::Exit)), + ) + .child( + h_stack() + .child(IconButton::new("mute-microphone", ui::Icon::Mic)) + .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) + .child(IconButton::new("screen-share", ui::Icon::Screen)) + .pl_2(), + ), + ) + }) } } diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs index 3c0f4c00be..c28f0dca30 100644 --- a/crates/gpui2/src/elements/img.rs +++ b/crates/gpui2/src/elements/img.rs @@ -1,30 +1,59 @@ +use std::sync::Arc; + use crate::{ - Bounds, Element, InteractiveElement, InteractiveElementState, Interactivity, LayoutId, Pixels, - RenderOnce, SharedString, StyleRefinement, Styled, WindowContext, + Bounds, Element, ImageData, InteractiveElement, InteractiveElementState, Interactivity, + LayoutId, Pixels, RenderOnce, SharedString, StyleRefinement, Styled, WindowContext, }; use futures::FutureExt; use util::ResultExt; +#[derive(Clone, Debug)] +pub enum ImageSource { + /// Image content will be loaded from provided URI at render time. + Uri(SharedString), + Data(Arc), +} + +impl From for ImageSource { + fn from(value: SharedString) -> Self { + Self::Uri(value) + } +} + +impl From> for ImageSource { + fn from(value: Arc) -> Self { + Self::Data(value) + } +} + pub struct Img { interactivity: Interactivity, - uri: Option, + source: Option, grayscale: bool, } pub fn img() -> Img { Img { interactivity: Interactivity::default(), - uri: None, + source: None, grayscale: false, } } impl Img { pub fn uri(mut self, uri: impl Into) -> Self { - self.uri = Some(uri.into()); + self.source = Some(ImageSource::from(uri.into())); + self + } + pub fn data(mut self, data: Arc) -> Self { + self.source = Some(ImageSource::from(data)); self } + pub fn source(mut self, source: impl Into) -> Self { + self.source = Some(source.into()); + self + } pub fn grayscale(mut self, grayscale: bool) -> Self { self.grayscale = grayscale; self @@ -58,28 +87,33 @@ impl Element for Img { |style, _scroll_offset, cx| { let corner_radii = style.corner_radii; - if let Some(uri) = self.uri.clone() { - // eprintln!(">>> image_cache.get({uri}"); - let image_future = cx.image_cache.get(uri.clone()); - // eprintln!("<<< image_cache.get({uri}"); - if let Some(data) = image_future - .clone() - .now_or_never() - .and_then(|result| result.ok()) - { - let corner_radii = corner_radii.to_pixels(bounds.size, cx.rem_size()); - cx.with_z_index(1, |cx| { - cx.paint_image(bounds, corner_radii, data, self.grayscale) - .log_err() - }); - } else { - cx.spawn(|mut cx| async move { - if image_future.await.ok().is_some() { - cx.on_next_frame(|cx| cx.notify()); + if let Some(source) = self.source { + let image = match source { + ImageSource::Uri(uri) => { + let image_future = cx.image_cache.get(uri.clone()); + if let Some(data) = image_future + .clone() + .now_or_never() + .and_then(|result| result.ok()) + { + data + } else { + cx.spawn(|mut cx| async move { + if image_future.await.ok().is_some() { + cx.on_next_frame(|cx| cx.notify()); + } + }) + .detach(); + return; } - }) - .detach() - } + } + ImageSource::Data(image) => image, + }; + let corner_radii = corner_radii.to_pixels(bounds.size, cx.rem_size()); + cx.with_z_index(1, |cx| { + cx.paint_image(bounds, corner_radii, image, self.grayscale) + .log_err() + }); } }, ) diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index 364a145494..872d62fa12 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -1,5 +1,5 @@ use crate::prelude::*; -use gpui::{img, Img, RenderOnce}; +use gpui::{img, ImageSource, Img, RenderOnce}; #[derive(Debug, Default, PartialEq, Clone)] pub enum Shape { @@ -10,7 +10,7 @@ pub enum Shape { #[derive(RenderOnce)] pub struct Avatar { - src: SharedString, + src: ImageSource, shape: Shape, } @@ -26,7 +26,7 @@ impl Component for Avatar { img = img.rounded_md(); } - img.uri(self.src.clone()) + img.source(self.src.clone()) .size_4() // todo!(Pull the avatar fallback background from the theme.) .bg(gpui::red()) @@ -34,7 +34,7 @@ impl Component for Avatar { } impl Avatar { - pub fn new(src: impl Into) -> Self { + pub fn new(src: impl Into) -> Self { Self { src: src.into(), shape: Shape::Circle, diff --git a/crates/ui2/src/components/stories/avatar.rs b/crates/ui2/src/components/stories/avatar.rs index ad9c3ccb39..177065cfcb 100644 --- a/crates/ui2/src/components/stories/avatar.rs +++ b/crates/ui2/src/components/stories/avatar.rs @@ -14,10 +14,10 @@ impl Render for AvatarStory { .child(Story::title_for::()) .child(Story::label("Default")) .child(Avatar::new( - "https://avatars.githubusercontent.com/u/1714999?v=4", + "https://avatars.githubusercontent.com/u/1714999?v=4".into(), )) .child(Avatar::new( - "https://avatars.githubusercontent.com/u/326587?v=4", + "https://avatars.githubusercontent.com/u/326587?v=4".into(), )) } } diff --git a/crates/util/src/channel.rs b/crates/util/src/channel.rs index 55f13df084..94260c71db 100644 --- a/crates/util/src/channel.rs +++ b/crates/util/src/channel.rs @@ -19,7 +19,7 @@ lazy_static! { pub struct AppCommitSha(pub String); -#[derive(Copy, Clone, PartialEq, Eq, Default)] +#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)] pub enum ReleaseChannel { #[default] Dev, diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index b09b47d24c..761b09365d 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -3408,6 +3408,10 @@ impl Workspace { self.modal_layer .update(cx, |modal_layer, cx| modal_layer.toggle_modal(cx, build)) } + + pub fn call_state(&mut self) -> &mut dyn CallHandler { + &mut *self.call_handler + } } fn window_bounds_env_override(cx: &AsyncAppContext) -> Option { From b463454062fae91775e4604e5a4c4ab42bf0ee7d Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:03:54 +0100 Subject: [PATCH 02/19] Remove redundant comment --- crates/collab_ui2/src/collab_titlebar_item.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 13a3ee6732..7c9cb9f453 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -172,7 +172,7 @@ impl Render for CollabTitlebarItem { .detach_and_log_err(cx); })) } - }) // that's obviously wrong as we should check for current call,not current user + }) .when(is_in_room, |this| { this.child( h_stack() From 2a2b3b5e918a8f47acd01b3bfdb371c7e34ac21f Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:08:21 +0100 Subject: [PATCH 03/19] Authenticate on app startup --- crates/zed2/src/main.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index bbf7c3ae9c..b18eccace7 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -8,7 +8,7 @@ use anyhow::{anyhow, Context as _, Result}; use backtrace::Backtrace; use chrono::Utc; use cli::FORCE_CLI_MODE_ENV_VAR_NAME; -use client::UserStore; +use client::{Client, UserStore}; use db::kvp::KEY_VALUE_STORE; use editor::Editor; use fs::RealFs; @@ -249,7 +249,7 @@ fn main() { } } - let mut _triggered_authentication = false; + let mut triggered_authentication = false; fn open_paths_and_log_errs( paths: &[PathBuf], @@ -328,23 +328,23 @@ fn main() { }) .detach(); - // if !triggered_authentication { - // cx.spawn(|cx| async move { authenticate(client, &cx).await }) - // .detach_and_log_err(cx); - // } + if !triggered_authentication { + cx.spawn(|cx| async move { authenticate(client, &cx).await }) + .detach_and_log_err(cx); + } }); } -// async fn authenticate(client: Arc, cx: &AsyncAppContext) -> Result<()> { -// if stdout_is_a_pty() { -// if client::IMPERSONATE_LOGIN.is_some() { -// client.authenticate_and_connect(false, &cx).await?; -// } -// } else if client.has_keychain_credentials(&cx) { -// client.authenticate_and_connect(true, &cx).await?; -// } -// Ok::<_, anyhow::Error>(()) -// } +async fn authenticate(client: Arc, cx: &AsyncAppContext) -> Result<()> { + if stdout_is_a_pty() { + if client::IMPERSONATE_LOGIN.is_some() { + client.authenticate_and_connect(false, &cx).await?; + } + } else if client.has_keychain_credentials(&cx).await { + client.authenticate_and_connect(true, &cx).await?; + } + Ok::<_, anyhow::Error>(()) +} async fn installation_id() -> Result<(String, bool)> { let legacy_key_name = "device_id"; From e754c6626de7c8a61f4a2010fbd2ba6e176e560a Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:19:25 +0100 Subject: [PATCH 04/19] Allow calling an user, render contacts in collab panel --- crates/call2/src/call2.rs | 82 +++++++++++++++------------ crates/collab_ui2/src/collab_panel.rs | 42 +++++++++++--- crates/workspace2/src/workspace2.rs | 6 ++ 3 files changed, 86 insertions(+), 44 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 8e553a9b16..9aa8c11428 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -549,42 +549,6 @@ impl Call { #[async_trait(?Send)] impl CallHandler for Call { - fn shared_screen_for_peer( - &self, - peer_id: PeerId, - _pane: &View, - cx: &mut ViewContext, - ) -> Option> { - let (call, _) = self.active_call.as_ref()?; - let room = call.read(cx).room()?.read(cx); - let participant = room.remote_participant_for_peer_id(peer_id)?; - let _track = participant.video_tracks.values().next()?.clone(); - let _user = participant.user.clone(); - todo!(); - // for item in pane.read(cx).items_of_type::() { - // if item.read(cx).peer_id == peer_id { - // return Box::new(Some(item)); - // } - // } - - // Some(Box::new(cx.build_view(|cx| { - // SharedScreen::new(&track, peer_id, user.clone(), cx) - // }))) - } - - fn room_id(&self, cx: &AppContext) -> Option { - Some(self.active_call.as_ref()?.0.read(cx).room()?.read(cx).id()) - } - fn hang_up(&self, mut cx: AsyncWindowContext) -> Result>> { - let Some((call, _)) = self.active_call.as_ref() else { - bail!("Cannot exit a call; not in a call"); - }; - - call.update(&mut cx, |this, cx| this.hang_up(cx)) - } - fn active_project(&self, cx: &AppContext) -> Option> { - ActiveCall::global(cx).read(cx).location().cloned() - } fn peer_state( &mut self, leader_id: PeerId, @@ -618,6 +582,52 @@ impl CallHandler for Call { Some((leader_in_this_project, leader_in_this_app)) } + + fn shared_screen_for_peer( + &self, + peer_id: PeerId, + _pane: &View, + cx: &mut ViewContext, + ) -> Option> { + let (call, _) = self.active_call.as_ref()?; + let room = call.read(cx).room()?.read(cx); + let participant = room.remote_participant_for_peer_id(peer_id)?; + let _track = participant.video_tracks.values().next()?.clone(); + let _user = participant.user.clone(); + todo!(); + // for item in pane.read(cx).items_of_type::() { + // if item.read(cx).peer_id == peer_id { + // return Box::new(Some(item)); + // } + // } + + // Some(Box::new(cx.build_view(|cx| { + // SharedScreen::new(&track, peer_id, user.clone(), cx) + // }))) + } + fn room_id(&self, cx: &AppContext) -> Option { + Some(self.active_call.as_ref()?.0.read(cx).room()?.read(cx).id()) + } + fn hang_up(&self, mut cx: AsyncWindowContext) -> Result>> { + let Some((call, _)) = self.active_call.as_ref() else { + bail!("Cannot exit a call; not in a call"); + }; + + call.update(&mut cx, |this, cx| this.hang_up(cx)) + } + fn active_project(&self, cx: &AppContext) -> Option> { + ActiveCall::global(cx).read(cx).location().cloned() + } + fn invite( + &mut self, + called_user_id: u64, + initial_project: Option>, + cx: &mut AppContext, + ) -> Task> { + ActiveCall::global(cx).update(cx, |this, cx| { + this.invite(called_user_id, initial_project, cx) + }) + } } #[cfg(test)] diff --git a/crates/collab_ui2/src/collab_panel.rs b/crates/collab_ui2/src/collab_panel.rs index 6af188dfd2..abeb481d53 100644 --- a/crates/collab_ui2/src/collab_panel.rs +++ b/crates/collab_ui2/src/collab_panel.rs @@ -157,15 +157,17 @@ const COLLABORATION_PANEL_KEY: &'static str = "CollaborationPanel"; use std::sync::Arc; +use client::{Client, Contact, UserStore}; use db::kvp::KEY_VALUE_STORE; use gpui::{ actions, div, serde_json, AppContext, AsyncWindowContext, Div, EventEmitter, FocusHandle, - Focusable, FocusableView, InteractiveElement, ParentElement, Render, View, ViewContext, - VisualContext, WeakView, + Focusable, FocusableView, InteractiveElement, Model, ParentElement, Render, Styled, View, + ViewContext, VisualContext, WeakView, }; use project::Fs; use serde_derive::{Deserialize, Serialize}; use settings::Settings; +use ui::{h_stack, Avatar, Label}; use util::ResultExt; use workspace::{ dock::{DockPosition, Panel, PanelEvent}, @@ -299,8 +301,8 @@ pub struct CollabPanel { // channel_editing_state: Option, // entries: Vec, // selection: Option, - // user_store: ModelHandle, - // client: Arc, + user_store: Model, + client: Arc, // channel_store: ModelHandle, // project: ModelHandle, // match_candidates: Vec, @@ -595,7 +597,7 @@ impl CollabPanel { // entries: Vec::default(), // channel_editing_state: None, // selection: None, - // user_store: workspace.user_store().clone(), + user_store: workspace.user_store().clone(), // channel_store: ChannelStore::global(cx), // project: workspace.project().clone(), // subscriptions: Vec::default(), @@ -603,7 +605,7 @@ impl CollabPanel { // collapsed_sections: vec![Section::Offline], // collapsed_channels: Vec::default(), _workspace: workspace.weak_handle(), - // client: workspace.app_state().client.clone(), + client: workspace.app_state().client.clone(), // context_menu_on_selected: true, // drag_target_channel: ChannelDragTarget::None, // list_state, @@ -663,6 +665,9 @@ impl CollabPanel { }) } + fn contacts(&self, cx: &AppContext) -> Option>> { + Some(self.user_store.read(cx).contacts().to_owned()) + } pub async fn load( workspace: WeakView, mut cx: AsyncWindowContext, @@ -3297,11 +3302,32 @@ impl CollabPanel { impl Render for CollabPanel { type Element = Focusable
; - fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { + fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + let contacts = self.contacts(cx).unwrap_or_default(); + let workspace = self._workspace.clone(); div() .key_context("CollabPanel") .track_focus(&self.focus_handle) - .child("COLLAB PANEL") + .children(contacts.into_iter().map(|contact| { + let id = contact.user.id; + h_stack() + .p_2() + .gap_2() + .children( + contact + .user + .avatar + .as_ref() + .map(|avatar| Avatar::new(avatar.clone())), + ) + .child(Label::new(contact.user.github_login.clone())) + .on_mouse_down(gpui::MouseButton::Left, { + let workspace = workspace.clone(); + move |event, cx| { + workspace.update(cx, |this, cx| this.call_state().invite(id, None, cx)); + } + }) + })) } } diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 761b09365d..8c687becd0 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -454,6 +454,12 @@ pub trait CallHandler { } fn hang_up(&self, cx: AsyncWindowContext) -> Result>>; fn active_project(&self, cx: &AppContext) -> Option>; + fn invite( + &mut self, + called_user_id: u64, + initial_project: Option>, + cx: &mut AppContext, + ) -> Task>; } pub struct Workspace { From f2b62c3946d7392469bebcf0857c893e0e8135bc Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 24 Nov 2023 00:52:44 +0100 Subject: [PATCH 05/19] Start emitting notifications for calls --- Cargo.lock | 1 + crates/collab_ui2/src/collab_ui.rs | 58 +-- crates/collab_ui2/src/notifications.rs | 16 +- .../incoming_call_notification.rs | 350 ++++++++++-------- crates/zed2/Cargo.toml | 2 +- crates/zed2/src/main.rs | 2 +- 6 files changed, 241 insertions(+), 188 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99d4827966..693f2d9156 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11644,6 +11644,7 @@ dependencies = [ "async-recursion 0.3.2", "async-tar", "async-trait", + "audio2", "auto_update2", "backtrace", "call2", diff --git a/crates/collab_ui2/src/collab_ui.rs b/crates/collab_ui2/src/collab_ui.rs index d2e6b28115..d1e4bea7d6 100644 --- a/crates/collab_ui2/src/collab_ui.rs +++ b/crates/collab_ui2/src/collab_ui.rs @@ -7,11 +7,14 @@ pub mod notification_panel; pub mod notifications; mod panel_settings; -use std::sync::Arc; +use std::{rc::Rc, sync::Arc}; pub use collab_panel::CollabPanel; pub use collab_titlebar_item::CollabTitlebarItem; -use gpui::AppContext; +use gpui::{ + point, px, AppContext, GlobalPixels, Pixels, PlatformDisplay, Point, Size, WindowBounds, + WindowKind, WindowOptions, +}; pub use panel_settings::{ ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings, }; @@ -23,7 +26,7 @@ use workspace::AppState; // [ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall] // ); -pub fn init(_app_state: &Arc, cx: &mut AppContext) { +pub fn init(app_state: &Arc, cx: &mut AppContext) { CollaborationPanelSettings::register(cx); ChatPanelSettings::register(cx); NotificationPanelSettings::register(cx); @@ -32,7 +35,7 @@ pub fn init(_app_state: &Arc, cx: &mut AppContext) { collab_titlebar_item::init(cx); collab_panel::init(cx); // chat_panel::init(cx); - // notifications::init(&app_state, cx); + notifications::init(&app_state, cx); // cx.add_global_action(toggle_screen_sharing); // cx.add_global_action(toggle_mute); @@ -95,31 +98,30 @@ pub fn init(_app_state: &Arc, cx: &mut AppContext) { // } // } -// fn notification_window_options( -// screen: Rc, -// window_size: Vector2F, -// ) -> WindowOptions<'static> { -// const NOTIFICATION_PADDING: f32 = 16.; +fn notification_window_options( + screen: Rc, + window_size: Size, +) -> WindowOptions { + let notification_padding = Pixels::from(16.); -// let screen_bounds = screen.content_bounds(); -// WindowOptions { -// bounds: WindowBounds::Fixed(RectF::new( -// screen_bounds.upper_right() -// + vec2f( -// -NOTIFICATION_PADDING - window_size.x(), -// NOTIFICATION_PADDING, -// ), -// window_size, -// )), -// titlebar: None, -// center: false, -// focus: false, -// show: true, -// kind: WindowKind::PopUp, -// is_movable: false, -// screen: Some(screen), -// } -// } + let screen_bounds = screen.bounds(); + let size: Size = window_size.into(); + + let bounds = gpui::Bounds:: { + origin: screen_bounds.origin, + size: window_size.into(), + }; + WindowOptions { + bounds: WindowBounds::Fixed(bounds), + titlebar: None, + center: false, + focus: false, + show: true, + kind: WindowKind::PopUp, + is_movable: false, + display_id: Some(screen.id()), + } +} // fn render_avatar( // avatar: Option>, diff --git a/crates/collab_ui2/src/notifications.rs b/crates/collab_ui2/src/notifications.rs index bc5d7ad3bf..b58473476a 100644 --- a/crates/collab_ui2/src/notifications.rs +++ b/crates/collab_ui2/src/notifications.rs @@ -1,11 +1,11 @@ -// use gpui::AppContext; -// use std::sync::Arc; -// use workspace::AppState; +use gpui::AppContext; +use std::sync::Arc; +use workspace::AppState; -// pub mod incoming_call_notification; +pub mod incoming_call_notification; // pub mod project_shared_notification; -// pub fn init(app_state: &Arc, cx: &mut AppContext) { -// incoming_call_notification::init(app_state, cx); -// project_shared_notification::init(app_state, cx); -// } +pub fn init(app_state: &Arc, cx: &mut AppContext) { + incoming_call_notification::init(app_state, cx); + //project_shared_notification::init(app_state, cx); +} diff --git a/crates/collab_ui2/src/notifications/incoming_call_notification.rs b/crates/collab_ui2/src/notifications/incoming_call_notification.rs index c614a814ca..d400b14f5f 100644 --- a/crates/collab_ui2/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui2/src/notifications/incoming_call_notification.rs @@ -3,12 +3,12 @@ use call::{ActiveCall, IncomingCall}; use client::proto; use futures::StreamExt; use gpui::{ - elements::*, - geometry::vector::vec2f, - platform::{CursorStyle, MouseButton}, - AnyElement, AppContext, Entity, View, ViewContext, WindowHandle, + blue, div, green, px, red, AnyElement, AppContext, Component, Context, Div, Element, Entity, + EventEmitter, GlobalPixels, ParentElement, Render, RenderOnce, StatefulInteractiveElement, + Styled, View, ViewContext, VisualContext as _, WindowHandle, }; use std::sync::{Arc, Weak}; +use ui::{h_stack, v_stack, Avatar, Button, Label}; use util::ResultExt; use workspace::AppState; @@ -19,23 +19,44 @@ pub fn init(app_state: &Arc, cx: &mut AppContext) { let mut notification_windows: Vec> = Vec::new(); while let Some(incoming_call) = incoming_call.next().await { for window in notification_windows.drain(..) { - window.remove(&mut cx); + window.update(&mut cx, |this, cx| { + //cx.remove_window(); + }); + //cx.update_window(window.into(), |this, cx| cx.remove_window()); + //window.remove(&mut cx); } if let Some(incoming_call) = incoming_call { - let window_size = cx.read(|cx| { - let theme = &theme::current(cx).incoming_call_notification; - vec2f(theme.window_width, theme.window_height) - }); + let unique_screens = cx.update(|cx| cx.displays()).unwrap(); + let window_size = gpui::Size { + width: px(380.), + height: px(64.), + }; - for screen in cx.platform().screens() { + for window in unique_screens { + let options = notification_window_options(window, window_size); + dbg!(&options); let window = cx - .add_window(notification_window_options(screen, window_size), |_| { - IncomingCallNotification::new(incoming_call.clone(), app_state.clone()) - }); - + .open_window(options, |cx| { + cx.build_view(|_| { + IncomingCallNotification::new( + incoming_call.clone(), + app_state.clone(), + ) + }) + }) + .unwrap(); notification_windows.push(window); } + + // for screen in cx.platform().screens() { + // let window = cx + // .add_window(notification_window_options(screen, window_size), |_| { + // IncomingCallNotification::new(incoming_call.clone(), app_state.clone()) + // }); + + // notification_windows.push(window); + // } } } }) @@ -47,167 +68,196 @@ struct RespondToCall { accept: bool, } -pub struct IncomingCallNotification { +struct IncomingCallNotificationState { call: IncomingCall, app_state: Weak, } -impl IncomingCallNotification { +pub struct IncomingCallNotification { + state: Arc, +} +impl IncomingCallNotificationState { pub fn new(call: IncomingCall, app_state: Weak) -> Self { Self { call, app_state } } - fn respond(&mut self, accept: bool, cx: &mut ViewContext) { + fn respond(&self, accept: bool, cx: &mut AppContext) { let active_call = ActiveCall::global(cx); if accept { let join = active_call.update(cx, |active_call, cx| active_call.accept_incoming(cx)); let caller_user_id = self.call.calling_user.id; let initial_project_id = self.call.initial_project.as_ref().map(|project| project.id); let app_state = self.app_state.clone(); - cx.app_context() - .spawn(|mut cx| async move { - join.await?; - if let Some(project_id) = initial_project_id { - cx.update(|cx| { - if let Some(app_state) = app_state.upgrade() { - workspace::join_remote_project( - project_id, - caller_user_id, - app_state, - cx, - ) - .detach_and_log_err(cx); - } - }); - } - anyhow::Ok(()) - }) - .detach_and_log_err(cx); + let cx: &mut AppContext = cx; + cx.spawn(|mut cx| async move { + join.await?; + if let Some(project_id) = initial_project_id { + cx.update(|cx| { + if let Some(app_state) = app_state.upgrade() { + // workspace::join_remote_project( + // project_id, + // caller_user_id, + // app_state, + // cx, + // ) + // .detach_and_log_err(cx); + } + }); + } + anyhow::Ok(()) + }) + .detach_and_log_err(cx); } else { active_call.update(cx, |active_call, cx| { active_call.decline_incoming(cx).log_err(); }); } } +} - fn render_caller(&self, cx: &mut ViewContext) -> AnyElement { - let theme = &theme::current(cx).incoming_call_notification; - let default_project = proto::ParticipantProject::default(); - let initial_project = self - .call - .initial_project - .as_ref() - .unwrap_or(&default_project); - Flex::row() - .with_children(self.call.calling_user.avatar.clone().map(|avatar| { - Image::from_data(avatar) - .with_style(theme.caller_avatar) - .aligned() +impl IncomingCallNotification { + pub fn new(call: IncomingCall, app_state: Weak) -> Self { + Self { + state: Arc::new(IncomingCallNotificationState::new(call, app_state)), + } + } + fn render_caller(&self, cx: &mut ViewContext) -> impl Element { + h_stack() + .children( + self.state + .call + .calling_user + .avatar + .as_ref() + .map(|avatar| Avatar::new(avatar.clone())), + ) + .child( + v_stack() + .child(Label::new(format!( + "{} is sharing a project in Zed", + self.state.call.calling_user.github_login + ))) + .child(self.render_buttons(cx)), + ) + // let theme = &theme::current(cx).incoming_call_notification; + // let default_project = proto::ParticipantProject::default(); + // let initial_project = self + // .call + // .initial_project + // .as_ref() + // .unwrap_or(&default_project); + // Flex::row() + // .with_children(self.call.calling_user.avatar.clone().map(|avatar| { + // Image::from_data(avatar) + // .with_style(theme.caller_avatar) + // .aligned() + // })) + // .with_child( + // Flex::column() + // .with_child( + // Label::new( + // self.call.calling_user.github_login.clone(), + // theme.caller_username.text.clone(), + // ) + // .contained() + // .with_style(theme.caller_username.container), + // ) + // .with_child( + // Label::new( + // format!( + // "is sharing a project in Zed{}", + // if initial_project.worktree_root_names.is_empty() { + // "" + // } else { + // ":" + // } + // ), + // theme.caller_message.text.clone(), + // ) + // .contained() + // .with_style(theme.caller_message.container), + // ) + // .with_children(if initial_project.worktree_root_names.is_empty() { + // None + // } else { + // Some( + // Label::new( + // initial_project.worktree_root_names.join(", "), + // theme.worktree_roots.text.clone(), + // ) + // .contained() + // .with_style(theme.worktree_roots.container), + // ) + // }) + // .contained() + // .with_style(theme.caller_metadata) + // .aligned(), + // ) + // .contained() + // .with_style(theme.caller_container) + // .flex(1., true) + // .into_any() + } + + fn render_buttons(&self, cx: &mut ViewContext) -> impl Element { + h_stack() + .child(Button::new("Accept").render(cx).bg(green()).on_click({ + let state = self.state.clone(); + move |_, cx| state.respond(true, cx) + })) + .child(Button::new("Decline").render(cx).bg(red()).on_click({ + let state = self.state.clone(); + move |_, cx| state.respond(false, cx) })) - .with_child( - Flex::column() - .with_child( - Label::new( - self.call.calling_user.github_login.clone(), - theme.caller_username.text.clone(), - ) - .contained() - .with_style(theme.caller_username.container), - ) - .with_child( - Label::new( - format!( - "is sharing a project in Zed{}", - if initial_project.worktree_root_names.is_empty() { - "" - } else { - ":" - } - ), - theme.caller_message.text.clone(), - ) - .contained() - .with_style(theme.caller_message.container), - ) - .with_children(if initial_project.worktree_root_names.is_empty() { - None - } else { - Some( - Label::new( - initial_project.worktree_root_names.join(", "), - theme.worktree_roots.text.clone(), - ) - .contained() - .with_style(theme.worktree_roots.container), - ) - }) - .contained() - .with_style(theme.caller_metadata) - .aligned(), - ) - .contained() - .with_style(theme.caller_container) - .flex(1., true) - .into_any() - } - fn render_buttons(&self, cx: &mut ViewContext) -> AnyElement { - enum Accept {} - enum Decline {} + // enum Accept {} + // enum Decline {} - let theme = theme::current(cx); - Flex::column() - .with_child( - MouseEventHandler::new::(0, cx, |_, _| { - let theme = &theme.incoming_call_notification; - Label::new("Accept", theme.accept_button.text.clone()) - .aligned() - .contained() - .with_style(theme.accept_button.container) - }) - .with_cursor_style(CursorStyle::PointingHand) - .on_click(MouseButton::Left, |_, this, cx| { - this.respond(true, cx); - }) - .flex(1., true), - ) - .with_child( - MouseEventHandler::new::(0, cx, |_, _| { - let theme = &theme.incoming_call_notification; - Label::new("Decline", theme.decline_button.text.clone()) - .aligned() - .contained() - .with_style(theme.decline_button.container) - }) - .with_cursor_style(CursorStyle::PointingHand) - .on_click(MouseButton::Left, |_, this, cx| { - this.respond(false, cx); - }) - .flex(1., true), - ) - .constrained() - .with_width(theme.incoming_call_notification.button_width) - .into_any() + // let theme = theme::current(cx); + // Flex::column() + // .with_child( + // MouseEventHandler::new::(0, cx, |_, _| { + // let theme = &theme.incoming_call_notification; + // Label::new("Accept", theme.accept_button.text.clone()) + // .aligned() + // .contained() + // .with_style(theme.accept_button.container) + // }) + // .with_cursor_style(CursorStyle::PointingHand) + // .on_click(MouseButton::Left, |_, this, cx| { + // this.respond(true, cx); + // }) + // .flex(1., true), + // ) + // .with_child( + // MouseEventHandler::new::(0, cx, |_, _| { + // let theme = &theme.incoming_call_notification; + // Label::new("Decline", theme.decline_button.text.clone()) + // .aligned() + // .contained() + // .with_style(theme.decline_button.container) + // }) + // .with_cursor_style(CursorStyle::PointingHand) + // .on_click(MouseButton::Left, |_, this, cx| { + // this.respond(false, cx); + // }) + // .flex(1., true), + // ) + // .constrained() + // .with_width(theme.incoming_call_notification.button_width) + // .into_any() } } - -impl Entity for IncomingCallNotification { - type Event = (); -} - -impl View for IncomingCallNotification { - fn ui_name() -> &'static str { - "IncomingCallNotification" - } - - fn render(&mut self, cx: &mut ViewContext) -> AnyElement { - let background = theme::current(cx).incoming_call_notification.background; - Flex::row() - .with_child(self.render_caller(cx)) - .with_child(self.render_buttons(cx)) - .contained() - .with_background_color(background) - .expanded() - .into_any() +impl Render for IncomingCallNotification { + type Element = Div; + fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + div().bg(red()).flex_none().child(self.render_caller(cx)) + // Flex::row() + // .with_child() + // .with_child(self.render_buttons(cx)) + // .contained() + // .with_background_color(background) + // .expanded() + // .into_any() } } diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml index 24648f87f1..3212b6182b 100644 --- a/crates/zed2/Cargo.toml +++ b/crates/zed2/Cargo.toml @@ -16,7 +16,7 @@ path = "src/main.rs" [dependencies] ai = { package = "ai2", path = "../ai2"} -# audio = { path = "../audio" } +audio = { package = "audio2", path = "../audio2" } # activity_indicator = { path = "../activity_indicator" } auto_update = { package = "auto_update2", path = "../auto_update2" } # breadcrumbs = { path = "../breadcrumbs" } diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index b18eccace7..c9ed26436a 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -199,7 +199,7 @@ fn main() { }); cx.set_global(Arc::downgrade(&app_state)); - // audio::init(Assets, cx); + audio::init(Assets, cx); auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx); workspace::init(app_state.clone(), cx); From 6ebe5d5053af7b9d95cd28c2b1742a00a0d140fd Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:16:03 +0100 Subject: [PATCH 06/19] Add mute handling --- crates/call2/src/call2.rs | 37 +++++++++ crates/call2/src/room.rs | 3 +- crates/client2/src/client2.rs | 1 - crates/collab_ui2/src/collab_titlebar_item.rs | 77 ++++++++++++++----- crates/workspace2/src/workspace2.rs | 25 +++++- 5 files changed, 122 insertions(+), 21 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 9aa8c11428..e778316d59 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -17,6 +17,7 @@ use gpui::{ Subscription, Task, View, ViewContext, WeakModel, WeakView, }; pub use participant::ParticipantLocation; +use participant::RemoteParticipant; use postage::watch; use project::Project; use room::Event; @@ -628,6 +629,42 @@ impl CallHandler for Call { this.invite(called_user_id, initial_project, cx) }) } + fn remote_participants(&self, cx: &AppContext) -> Option>> { + self.active_call + .as_ref() + .map(|call| { + call.0.read(cx).room().map(|room| { + room.read(cx) + .remote_participants() + .iter() + .map(|participant| participant.1.user.clone()) + .collect() + }) + }) + .flatten() + } + fn is_muted(&self, cx: &AppContext) -> Option { + self.active_call + .as_ref() + .map(|call| { + call.0 + .read(cx) + .room() + .map(|room| room.read(cx).is_muted(cx)) + }) + .flatten() + } + fn toggle_mute(&self, cx: &mut AppContext) { + self.active_call.as_ref().map(|call| { + call.0.update(cx, |this, cx| { + this.room().map(|room| { + room.update(cx, |this, cx| { + this.toggle_mute(cx); + }) + }) + }) + }); + } } #[cfg(test)] diff --git a/crates/call2/src/room.rs b/crates/call2/src/room.rs index 87118764fd..d73a522937 100644 --- a/crates/call2/src/room.rs +++ b/crates/call2/src/room.rs @@ -333,7 +333,8 @@ impl Room { } pub fn mute_on_join(cx: &AppContext) -> bool { - CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some() + false + //CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some() } fn from_join_response( diff --git a/crates/client2/src/client2.rs b/crates/client2/src/client2.rs index 4ad354f2f9..b31451aa87 100644 --- a/crates/client2/src/client2.rs +++ b/crates/client2/src/client2.rs @@ -551,7 +551,6 @@ impl Client { F: 'static + Future>, { let message_type_id = TypeId::of::(); - let mut state = self.state.write(); state .models_by_message_type diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 7c9cb9f453..bcb43d4972 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -37,7 +37,8 @@ use gpui::{ }; use project::Project; use theme::ActiveTheme; -use ui::{h_stack, Button, ButtonVariant, Color, IconButton, KeyBinding, Tooltip}; +use ui::{h_stack, Avatar, Button, ButtonVariant, Color, IconButton, KeyBinding, Label, Tooltip}; +use util::ResultExt; use workspace::Workspace; // const MAX_PROJECT_NAME_LENGTH: usize = 40; @@ -92,6 +93,23 @@ impl Render for CollabTitlebarItem { let is_shared = is_in_room && self.project.read(cx).is_shared(); let current_user = self.user_store.read(cx).current_user(); let client = self.client.clone(); + let users = self + .workspace + .update(cx, |this, cx| this.call_state().remote_participants(cx)) + .log_err() + .flatten(); + let mic_icon = if self + .workspace + .update(cx, |this, cx| this.call_state().is_muted(cx)) + .log_err() + .flatten() + .unwrap_or_default() + { + ui::Icon::MicMute + } else { + ui::Icon::Mic + }; + let workspace = self.workspace.clone(); h_stack() .id("titlebar") .justify_between() @@ -157,6 +175,46 @@ impl Render for CollabTitlebarItem { }), ), ) + .when_some( + users.zip(current_user.clone()), + |this, (remote_participants, current_user)| { + this.children( + current_user + .avatar + .clone() + .map(|avatar| Avatar::new(avatar.clone())) + .into_iter() + .chain(remote_participants.into_iter().flat_map(|user| { + user.avatar + .as_ref() + .map(|avatar| Avatar::new(avatar.clone())) + })), + ) + }, + ) + .when(is_in_room, |this| { + this.child( + h_stack() + .child( + h_stack() + .child(Button::new(if is_shared { "Unshare" } else { "Share" })) + .child(IconButton::new("leave-call", ui::Icon::Exit)), + ) + .child( + h_stack() + .child(IconButton::new("mute-microphone", mic_icon).on_click( + move |_, cx| { + workspace.update(cx, |this, cx| { + this.call_state().toggle_mute(cx); + }); + }, + )) + .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) + .child(IconButton::new("screen-share", ui::Icon::Screen)) + .pl_2(), + ), + ) + }) .map(|this| { if let Some(user) = current_user { this.when_some(user.avatar.clone(), |this, avatar| { @@ -173,23 +231,6 @@ impl Render for CollabTitlebarItem { })) } }) - .when(is_in_room, |this| { - this.child( - h_stack() - .child( - h_stack() - .child(Button::new(if is_shared { "Unshare" } else { "Share" })) - .child(IconButton::new("leave-call", ui::Icon::Exit)), - ) - .child( - h_stack() - .child(IconButton::new("mute-microphone", ui::Icon::Mic)) - .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) - .child(IconButton::new("screen-share", ui::Icon::Screen)) - .pl_2(), - ), - ) - }) } } diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 8c687becd0..bccb25b64d 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -19,7 +19,7 @@ use anyhow::{anyhow, Context as _, Result}; use async_trait::async_trait; use client2::{ proto::{self, PeerId}, - Client, TypedEnvelope, UserStore, + Client, TypedEnvelope, User, UserStore, }; use collections::{hash_map, HashMap, HashSet}; use dock::{Dock, DockPosition, Panel, PanelButtons, PanelHandle}; @@ -351,7 +351,27 @@ impl CallHandler for TestCallHandler { fn active_project(&self, cx: &AppContext) -> Option> { None } + + fn invite( + &mut self, + called_user_id: u64, + initial_project: Option>, + cx: &mut AppContext, + ) -> Task> { + unimplemented!() + } + + fn remote_participants(&self, cx: &AppContext) -> Option> { + None + } + + fn is_muted(&self, cx: &AppContext) -> Option { + None + } + + fn toggle_mute(&self, cx: &mut AppContext) {} } + impl AppState { #[cfg(any(test, feature = "test-support"))] pub fn test(cx: &mut AppContext) -> Arc { @@ -460,6 +480,9 @@ pub trait CallHandler { initial_project: Option>, cx: &mut AppContext, ) -> Task>; + fn remote_participants(&self, cx: &AppContext) -> Option>>; + fn is_muted(&self, cx: &AppContext) -> Option; + fn toggle_mute(&self, cx: &mut AppContext); } pub struct Workspace { From 481c19fbaf0a6265ae80c5368f11619d3af73fd3 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 24 Nov 2023 17:31:47 +0100 Subject: [PATCH 07/19] WIP, frames are being sent to the other end --- Cargo.lock | 2 + crates/call2/Cargo.toml | 2 + crates/call2/src/call2.rs | 58 +++++-- crates/call2/src/participant.rs | 2 +- crates/call2/src/room.rs | 2 + crates/call2/src/shared_screen.rs | 159 ++++++++++++++++++ crates/collab_ui2/src/collab_titlebar_item.rs | 39 +++-- crates/workspace2/src/workspace2.rs | 69 ++++---- 8 files changed, 274 insertions(+), 59 deletions(-) create mode 100644 crates/call2/src/shared_screen.rs diff --git a/Cargo.lock b/Cargo.lock index 693f2d9156..27ff88f68a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1193,6 +1193,7 @@ dependencies = [ "fs2", "futures 0.3.28", "gpui2", + "image", "language2", "live_kit_client2", "log", @@ -1204,6 +1205,7 @@ dependencies = [ "serde_derive", "serde_json", "settings2", + "smallvec", "util", "workspace2", ] diff --git a/crates/call2/Cargo.toml b/crates/call2/Cargo.toml index 43e19b4ccb..a258cbe2cf 100644 --- a/crates/call2/Cargo.toml +++ b/crates/call2/Cargo.toml @@ -36,11 +36,13 @@ async-trait.workspace = true anyhow.workspace = true async-broadcast = "0.4" futures.workspace = true +image = "0.23" postage.workspace = true schemars.workspace = true serde.workspace = true serde_json.workspace = true serde_derive.workspace = true +smallvec.workspace = true [dev-dependencies] client = { package = "client2", path = "../client2", features = ["test-support"] } diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index e778316d59..5933f7404f 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -1,6 +1,7 @@ pub mod call_settings; pub mod participant; pub mod room; +mod shared_screen; use anyhow::{anyhow, bail, Result}; use async_trait::async_trait; @@ -14,7 +15,7 @@ use collections::HashSet; use futures::{channel::oneshot, future::Shared, Future, FutureExt}; use gpui::{ AppContext, AsyncAppContext, AsyncWindowContext, Context, EventEmitter, Model, ModelContext, - Subscription, Task, View, ViewContext, WeakModel, WeakView, + Subscription, Task, View, ViewContext, VisualContext, WeakModel, WeakView, }; pub use participant::ParticipantLocation; use participant::RemoteParticipant; @@ -23,6 +24,7 @@ use project::Project; use room::Event; pub use room::Room; use settings::Settings; +use shared_screen::SharedScreen; use std::sync::Arc; use util::ResultExt; use workspace::{item::ItemHandle, CallHandler, Pane, Workspace}; @@ -587,24 +589,27 @@ impl CallHandler for Call { fn shared_screen_for_peer( &self, peer_id: PeerId, - _pane: &View, + pane: &View, cx: &mut ViewContext, ) -> Option> { let (call, _) = self.active_call.as_ref()?; + dbg!("A"); let room = call.read(cx).room()?.read(cx); + dbg!("B"); let participant = room.remote_participant_for_peer_id(peer_id)?; - let _track = participant.video_tracks.values().next()?.clone(); - let _user = participant.user.clone(); - todo!(); - // for item in pane.read(cx).items_of_type::() { - // if item.read(cx).peer_id == peer_id { - // return Box::new(Some(item)); - // } - // } + dbg!("C"); + let track = participant.video_tracks.values().next()?.clone(); + dbg!("D"); + let user = participant.user.clone(); + for item in pane.read(cx).items_of_type::() { + if item.read(cx).peer_id == peer_id { + return Some(Box::new(item)); + } + } - // Some(Box::new(cx.build_view(|cx| { - // SharedScreen::new(&track, peer_id, user.clone(), cx) - // }))) + Some(Box::new(cx.build_view(|cx| { + SharedScreen::new(&track, peer_id, user.clone(), cx) + }))) } fn room_id(&self, cx: &AppContext) -> Option { Some(self.active_call.as_ref()?.0.read(cx).room()?.read(cx).id()) @@ -629,7 +634,7 @@ impl CallHandler for Call { this.invite(called_user_id, initial_project, cx) }) } - fn remote_participants(&self, cx: &AppContext) -> Option>> { + fn remote_participants(&self, cx: &AppContext) -> Option, PeerId)>> { self.active_call .as_ref() .map(|call| { @@ -637,7 +642,9 @@ impl CallHandler for Call { room.read(cx) .remote_participants() .iter() - .map(|participant| participant.1.user.clone()) + .map(|participant| { + (participant.1.user.clone(), participant.1.peer_id.clone()) + }) .collect() }) }) @@ -665,6 +672,27 @@ impl CallHandler for Call { }) }); } + fn toggle_screen_share(&self, cx: &mut AppContext) { + self.active_call.as_ref().map(|call| { + call.0.update(cx, |this, cx| { + this.room().map(|room| { + room.update(cx, |this, cx| { + if this.is_screen_sharing() { + dbg!("Unsharing"); + this.unshare_screen(cx); + } else { + dbg!("Sharing"); + let t = this.share_screen(cx); + cx.spawn(move |_, cx| async move { + t.await.log_err(); + }) + .detach(); + } + }) + }) + }) + }); + } } #[cfg(test)] diff --git a/crates/call2/src/participant.rs b/crates/call2/src/participant.rs index f62d103f17..325a4f812b 100644 --- a/crates/call2/src/participant.rs +++ b/crates/call2/src/participant.rs @@ -4,7 +4,7 @@ use client::{proto, User}; use collections::HashMap; use gpui::WeakModel; pub use live_kit_client::Frame; -use live_kit_client::{RemoteAudioTrack, RemoteVideoTrack}; +pub(crate) use live_kit_client::{RemoteAudioTrack, RemoteVideoTrack}; use project::Project; use std::sync::Arc; diff --git a/crates/call2/src/room.rs b/crates/call2/src/room.rs index d73a522937..5bba4cc750 100644 --- a/crates/call2/src/room.rs +++ b/crates/call2/src/room.rs @@ -1345,6 +1345,8 @@ impl Room { let display = displays .first() .ok_or_else(|| anyhow!("no display found"))?; + dbg!("Been there"); + dbg!(displays.len()); let track = LocalVideoTrack::screen_share_for_display(&display); this.upgrade() .ok_or_else(|| anyhow!("room was dropped"))? diff --git a/crates/call2/src/shared_screen.rs b/crates/call2/src/shared_screen.rs new file mode 100644 index 0000000000..a281948d6f --- /dev/null +++ b/crates/call2/src/shared_screen.rs @@ -0,0 +1,159 @@ +use crate::participant::{Frame, RemoteVideoTrack}; +use anyhow::Result; +use client::{proto::PeerId, User}; +use futures::StreamExt; +use gpui::{ + div, img, AppContext, Div, Element, Entity, EventEmitter, FocusHandle, FocusableView, + ImageData, Img, MouseButton, ParentElement, Render, SharedString, Task, View, ViewContext, + VisualContext, WindowContext, +}; +use smallvec::SmallVec; +use std::{ + borrow::Cow, + sync::{Arc, Weak}, +}; +use workspace::{ + item::{Item, ItemEvent}, + ItemNavHistory, WorkspaceId, +}; + +pub enum Event { + Close, +} + +pub struct SharedScreen { + track: Weak, + frame: Option, + pub peer_id: PeerId, + user: Arc, + nav_history: Option, + _maintain_frame: Task>, + focus: FocusHandle, +} + +impl SharedScreen { + pub fn new( + track: &Arc, + peer_id: PeerId, + user: Arc, + cx: &mut ViewContext, + ) -> Self { + cx.focus_handle(); + let mut frames = track.frames(); + Self { + track: Arc::downgrade(track), + frame: None, + peer_id, + user, + nav_history: Default::default(), + _maintain_frame: cx.spawn(|this, mut cx| async move { + while let Some(frame) = frames.next().await { + this.update(&mut cx, |this, cx| { + this.frame = Some(frame); + cx.notify(); + })?; + } + this.update(&mut cx, |_, cx| cx.emit(Event::Close))?; + Ok(()) + }), + focus: cx.focus_handle(), + } + } +} + +impl EventEmitter for SharedScreen {} +impl EventEmitter for SharedScreen {} + +impl FocusableView for SharedScreen { + fn focus_handle(&self, cx: &AppContext) -> FocusHandle { + self.focus.clone() + } +} +impl Render for SharedScreen { + type Element = Div; + fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + let frame = self.frame.clone(); + div().children(frame.map(|frame| { + img().data(Arc::new(ImageData::new(image::ImageBuffer::new( + frame.width() as u32, + frame.height() as u32, + )))) + })) + } +} +// impl View for SharedScreen { +// fn ui_name() -> &'static str { +// "SharedScreen" +// } + +// fn render(&mut self, cx: &mut ViewContext) -> AnyElement { +// enum Focus {} + +// let frame = self.frame.clone(); +// MouseEventHandler::new::(0, cx, |_, cx| { +// Canvas::new(move |bounds, _, _, cx| { +// if let Some(frame) = frame.clone() { +// let size = constrain_size_preserving_aspect_ratio( +// bounds.size(), +// vec2f(frame.width() as f32, frame.height() as f32), +// ); +// let origin = bounds.origin() + (bounds.size() / 2.) - size / 2.; +// cx.scene().push_surface(gpui::platform::mac::Surface { +// bounds: RectF::new(origin, size), +// image_buffer: frame.image(), +// }); +// } +// }) +// .contained() +// .with_style(theme::current(cx).shared_screen) +// }) +// .on_down(MouseButton::Left, |_, _, cx| cx.focus_parent()) +// .into_any() +// } +// } + +impl Item for SharedScreen { + fn tab_tooltip_text(&self, _: &AppContext) -> Option { + Some(format!("{}'s screen", self.user.github_login).into()) + } + fn deactivated(&mut self, cx: &mut ViewContext) { + if let Some(nav_history) = self.nav_history.as_mut() { + nav_history.push::<()>(None, cx); + } + } + + fn tab_content(&self, _: Option, _: &WindowContext<'_>) -> gpui::AnyElement { + div().child("Shared screen").into_any() + // Flex::row() + // .with_child( + // Svg::new("icons/desktop.svg") + // .with_color(style.label.text.color) + // .constrained() + // .with_width(style.type_icon_width) + // .aligned() + // .contained() + // .with_margin_right(style.spacing), + // ) + // .with_child( + // Label::new( + // format!("{}'s screen", self.user.github_login), + // style.label.clone(), + // ) + // .aligned(), + // ) + // .into_any() + } + + fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext) { + self.nav_history = Some(history); + } + + fn clone_on_split( + &self, + _workspace_id: WorkspaceId, + cx: &mut ViewContext, + ) -> Option> { + let track = self.track.upgrade()?; + Some(cx.build_view(|cx| Self::new(&track, self.peer_id, self.user.clone(), cx))) + } +} diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index bcb43d4972..aad908531a 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -31,9 +31,9 @@ use std::sync::Arc; use call::ActiveCall; use client::{Client, UserStore}; use gpui::{ - div, px, rems, AppContext, Div, InteractiveElement, IntoElement, Model, ParentElement, Render, - Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, VisualContext, - WeakView, WindowBounds, + div, px, rems, AppContext, Div, InteractiveElement, IntoElement, Model, MouseButton, + ParentElement, Render, Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, + VisualContext, WeakView, WindowBounds, }; use project::Project; use theme::ActiveTheme; @@ -182,12 +182,22 @@ impl Render for CollabTitlebarItem { current_user .avatar .clone() - .map(|avatar| Avatar::new(avatar.clone())) + .map(|avatar| div().child(Avatar::new(avatar.clone()))) .into_iter() - .chain(remote_participants.into_iter().flat_map(|user| { - user.avatar - .as_ref() - .map(|avatar| Avatar::new(avatar.clone())) + .chain(remote_participants.into_iter().flat_map(|(user, peer_id)| { + user.avatar.as_ref().map(|avatar| { + div() + .child(Avatar::new(avatar.clone()).into_element()) + .on_mouse_down(MouseButton::Left, { + let workspace = workspace.clone(); + let id = peer_id.clone(); + move |_, cx| { + workspace.update(cx, |this, cx| { + this.open_shared_screen(peer_id, cx); + }); + } + }) + }) })), ) }, @@ -202,15 +212,22 @@ impl Render for CollabTitlebarItem { ) .child( h_stack() - .child(IconButton::new("mute-microphone", mic_icon).on_click( + .child(IconButton::new("mute-microphone", mic_icon).on_click({ + let workspace = workspace.clone(); move |_, cx| { workspace.update(cx, |this, cx| { this.call_state().toggle_mute(cx); }); + } + })) + .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) + .child(IconButton::new("screen-share", ui::Icon::Screen).on_click( + move |_, cx| { + workspace.update(cx, |this, cx| { + this.call_state().toggle_screen_share(cx); + }); }, )) - .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) - .child(IconButton::new("screen-share", ui::Icon::Screen)) .pl_2(), ), ) diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index bccb25b64d..ac75902296 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -361,7 +361,7 @@ impl CallHandler for TestCallHandler { unimplemented!() } - fn remote_participants(&self, cx: &AppContext) -> Option> { + fn remote_participants(&self, cx: &AppContext) -> Option, PeerId)>> { None } @@ -370,6 +370,8 @@ impl CallHandler for TestCallHandler { } fn toggle_mute(&self, cx: &mut AppContext) {} + + fn toggle_screen_share(&self, cx: &mut AppContext) {} } impl AppState { @@ -480,9 +482,10 @@ pub trait CallHandler { initial_project: Option>, cx: &mut AppContext, ) -> Task>; - fn remote_participants(&self, cx: &AppContext) -> Option>>; + fn remote_participants(&self, cx: &AppContext) -> Option, PeerId)>>; fn is_muted(&self, cx: &AppContext) -> Option; fn toggle_mute(&self, cx: &mut AppContext); + fn toggle_screen_share(&self, cx: &mut AppContext); } pub struct Workspace { @@ -1996,13 +1999,15 @@ impl Workspace { item } - // pub fn open_shared_screen(&mut self, peer_id: PeerId, cx: &mut ViewContext) { - // if let Some(shared_screen) = self.shared_screen_for_peer(peer_id, &self.active_pane, cx) { - // self.active_pane.update(cx, |pane, cx| { - // pane.add_item(Box::new(shared_screen), false, true, None, cx) - // }); - // } - // } + pub fn open_shared_screen(&mut self, peer_id: PeerId, cx: &mut ViewContext) { + if let Some(shared_screen) = self.shared_screen_for_peer(peer_id, &self.active_pane, cx) { + self.active_pane.update(cx, |pane, cx| { + pane.add_item(shared_screen, false, true, None, cx) + }); + } else { + dbg!("WTF"); + } + } pub fn activate_item(&mut self, item: &dyn ItemHandle, cx: &mut ViewContext) -> bool { let result = self.panes.iter().find_map(|pane| { @@ -2877,10 +2882,10 @@ impl Workspace { } continue; } - // todo!() - // if let Some(shared_screen) = self.shared_screen_for_peer(leader_id, pane, cx) { - // items_to_activate.push((pane.clone(), Box::new(shared_screen))); - // } + + if let Some(shared_screen) = self.shared_screen_for_peer(leader_id, pane, cx) { + items_to_activate.push((pane.clone(), shared_screen)); + } } for (pane, item) in items_to_activate { @@ -2901,27 +2906,27 @@ impl Workspace { None } - // todo!() - // fn shared_screen_for_peer( - // &self, - // peer_id: PeerId, - // pane: &View, - // cx: &mut ViewContext, - // ) -> Option> { - // let call = self.active_call()?; - // let room = call.read(cx).room()?.read(cx); - // let participant = room.remote_participant_for_peer_id(peer_id)?; - // let track = participant.video_tracks.values().next()?.clone(); - // let user = participant.user.clone(); + fn shared_screen_for_peer( + &self, + peer_id: PeerId, + pane: &View, + cx: &mut ViewContext, + ) -> Option> { + self.call_handler.shared_screen_for_peer(peer_id, pane, cx) + // let call = self.active_call()?; + // let room = call.read(cx).room()?.read(cx); + // let participant = room.remote_participant_for_peer_id(peer_id)?; + // let track = participant.video_tracks.values().next()?.clone(); + // let user = participant.user.clone(); - // for item in pane.read(cx).items_of_type::() { - // if item.read(cx).peer_id == peer_id { - // return Some(item); - // } - // } + // for item in pane.read(cx).items_of_type::() { + // if item.read(cx).peer_id == peer_id { + // return Some(item); + // } + // } - // Some(cx.build_view(|cx| SharedScreen::new(&track, peer_id, user.clone(), cx))) - // } + // Some(cx.build_view(|cx| SharedScreen::new(&track, peer_id, user.clone(), cx))) + } pub fn on_window_activation_changed(&mut self, cx: &mut ViewContext) { if cx.is_window_active() { From fad1f8db96cbdcb355c25c2a74eb4f6d1dacb3b1 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:09:36 +0100 Subject: [PATCH 08/19] Remove shared_screen from workspace --- crates/workspace2/src/shared_screen.rs | 151 ------------------------- 1 file changed, 151 deletions(-) delete mode 100644 crates/workspace2/src/shared_screen.rs diff --git a/crates/workspace2/src/shared_screen.rs b/crates/workspace2/src/shared_screen.rs deleted file mode 100644 index b99c5f3ab9..0000000000 --- a/crates/workspace2/src/shared_screen.rs +++ /dev/null @@ -1,151 +0,0 @@ -use crate::{ - item::{Item, ItemEvent}, - ItemNavHistory, WorkspaceId, -}; -use anyhow::Result; -use call::participant::{Frame, RemoteVideoTrack}; -use client::{proto::PeerId, User}; -use futures::StreamExt; -use gpui::{ - elements::*, - geometry::{rect::RectF, vector::vec2f}, - platform::MouseButton, - AppContext, Entity, Task, View, ViewContext, -}; -use smallvec::SmallVec; -use std::{ - borrow::Cow, - sync::{Arc, Weak}, -}; - -pub enum Event { - Close, -} - -pub struct SharedScreen { - track: Weak, - frame: Option, - pub peer_id: PeerId, - user: Arc, - nav_history: Option, - _maintain_frame: Task>, -} - -impl SharedScreen { - pub fn new( - track: &Arc, - peer_id: PeerId, - user: Arc, - cx: &mut ViewContext, - ) -> Self { - let mut frames = track.frames(); - Self { - track: Arc::downgrade(track), - frame: None, - peer_id, - user, - nav_history: Default::default(), - _maintain_frame: cx.spawn(|this, mut cx| async move { - while let Some(frame) = frames.next().await { - this.update(&mut cx, |this, cx| { - this.frame = Some(frame); - cx.notify(); - })?; - } - this.update(&mut cx, |_, cx| cx.emit(Event::Close))?; - Ok(()) - }), - } - } -} - -impl Entity for SharedScreen { - type Event = Event; -} - -impl View for SharedScreen { - fn ui_name() -> &'static str { - "SharedScreen" - } - - fn render(&mut self, cx: &mut ViewContext) -> AnyElement { - enum Focus {} - - let frame = self.frame.clone(); - MouseEventHandler::new::(0, cx, |_, cx| { - Canvas::new(move |bounds, _, _, cx| { - if let Some(frame) = frame.clone() { - let size = constrain_size_preserving_aspect_ratio( - bounds.size(), - vec2f(frame.width() as f32, frame.height() as f32), - ); - let origin = bounds.origin() + (bounds.size() / 2.) - size / 2.; - cx.scene().push_surface(gpui::platform::mac::Surface { - bounds: RectF::new(origin, size), - image_buffer: frame.image(), - }); - } - }) - .contained() - .with_style(theme::current(cx).shared_screen) - }) - .on_down(MouseButton::Left, |_, _, cx| cx.focus_parent()) - .into_any() - } -} - -impl Item for SharedScreen { - fn tab_tooltip_text(&self, _: &AppContext) -> Option> { - Some(format!("{}'s screen", self.user.github_login).into()) - } - fn deactivated(&mut self, cx: &mut ViewContext) { - if let Some(nav_history) = self.nav_history.as_mut() { - nav_history.push::<()>(None, cx); - } - } - - fn tab_content( - &self, - _: Option, - style: &theme::Tab, - _: &AppContext, - ) -> gpui::AnyElement { - Flex::row() - .with_child( - Svg::new("icons/desktop.svg") - .with_color(style.label.text.color) - .constrained() - .with_width(style.type_icon_width) - .aligned() - .contained() - .with_margin_right(style.spacing), - ) - .with_child( - Label::new( - format!("{}'s screen", self.user.github_login), - style.label.clone(), - ) - .aligned(), - ) - .into_any() - } - - fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext) { - self.nav_history = Some(history); - } - - fn clone_on_split( - &self, - _workspace_id: WorkspaceId, - cx: &mut ViewContext, - ) -> Option { - let track = self.track.upgrade()?; - Some(Self::new(&track, self.peer_id, self.user.clone(), cx)) - } - - fn to_item_events(event: &Self::Event) -> SmallVec<[ItemEvent; 2]> { - match event { - Event::Close => smallvec::smallvec!(ItemEvent::CloseItem), - } - } -} From 4c1514edc43fd212377c67ec3199d5bd4d966df0 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:10:07 +0100 Subject: [PATCH 09/19] fixup! Remove shared_screen from workspace --- crates/workspace2/src/workspace2.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index ac75902296..fd52276ef4 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -9,7 +9,6 @@ pub mod pane_group; mod persistence; pub mod searchable; // todo!() -// pub mod shared_screen; mod modal_layer; mod status_bar; mod toolbar; From 5cbe8deb50faeee5376a1174baea021333586759 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:33:44 +0100 Subject: [PATCH 10/19] Fix up tests --- crates/collab_ui2/src/collab_panel.rs | 2 +- crates/collab_ui2/src/collab_titlebar_item.rs | 6 +++--- .../src/notifications/incoming_call_notification.rs | 2 +- crates/ui2/src/components/avatar.rs | 12 ++++++++++-- crates/ui2/src/components/list.rs | 4 ++-- crates/ui2/src/components/stories/avatar.rs | 8 ++++---- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/crates/collab_ui2/src/collab_panel.rs b/crates/collab_ui2/src/collab_panel.rs index abeb481d53..22a8a2cbba 100644 --- a/crates/collab_ui2/src/collab_panel.rs +++ b/crates/collab_ui2/src/collab_panel.rs @@ -3318,7 +3318,7 @@ impl Render for CollabPanel { .user .avatar .as_ref() - .map(|avatar| Avatar::new(avatar.clone())), + .map(|avatar| Avatar::data(avatar.clone())), ) .child(Label::new(contact.user.github_login.clone())) .on_mouse_down(gpui::MouseButton::Left, { diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index aad908531a..9386d3ff35 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -182,12 +182,12 @@ impl Render for CollabTitlebarItem { current_user .avatar .clone() - .map(|avatar| div().child(Avatar::new(avatar.clone()))) + .map(|avatar| div().child(Avatar::data(avatar.clone()))) .into_iter() .chain(remote_participants.into_iter().flat_map(|(user, peer_id)| { user.avatar.as_ref().map(|avatar| { div() - .child(Avatar::new(avatar.clone()).into_element()) + .child(Avatar::data(avatar.clone()).into_element()) .on_mouse_down(MouseButton::Left, { let workspace = workspace.clone(); let id = peer_id.clone(); @@ -235,7 +235,7 @@ impl Render for CollabTitlebarItem { .map(|this| { if let Some(user) = current_user { this.when_some(user.avatar.clone(), |this, avatar| { - this.child(ui::Avatar::new(avatar)) + this.child(ui::Avatar::data(avatar)) }) } else { this.child(Button::new("Sign in").on_click(move |_, cx| { diff --git a/crates/collab_ui2/src/notifications/incoming_call_notification.rs b/crates/collab_ui2/src/notifications/incoming_call_notification.rs index d400b14f5f..f47fcf0751 100644 --- a/crates/collab_ui2/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui2/src/notifications/incoming_call_notification.rs @@ -129,7 +129,7 @@ impl IncomingCallNotification { .calling_user .avatar .as_ref() - .map(|avatar| Avatar::new(avatar.clone())), + .map(|avatar| Avatar::data(avatar.clone())), ) .child( v_stack() diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index 0ea7702f52..d358b221da 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -1,5 +1,7 @@ +use std::sync::Arc; + use crate::prelude::*; -use gpui::{img, ImageSource, Img, IntoElement}; +use gpui::{img, ImageData, ImageSource, Img, IntoElement}; #[derive(Debug, Default, PartialEq, Clone)] pub enum Shape { @@ -34,7 +36,13 @@ impl RenderOnce for Avatar { } impl Avatar { - pub fn new(src: impl Into) -> Self { + pub fn uri(src: impl Into) -> Self { + Self { + src: src.into().into(), + shape: Shape::Circle, + } + } + pub fn data(src: Arc) -> Self { Self { src: src.into(), shape: Shape::Circle, diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs index a994583666..875ab6d97e 100644 --- a/crates/ui2/src/components/list.rs +++ b/crates/ui2/src/components/list.rs @@ -323,8 +323,8 @@ impl RenderOnce for ListItem { .color(Color::Muted), ), ), - Some(GraphicSlot::Avatar(src)) => Some(h_stack().child(Avatar::new(src))), - Some(GraphicSlot::PublicActor(src)) => Some(h_stack().child(Avatar::new(src))), + Some(GraphicSlot::Avatar(src)) => Some(h_stack().child(Avatar::uri(src))), + Some(GraphicSlot::PublicActor(src)) => Some(h_stack().child(Avatar::uri(src))), None => None, }; diff --git a/crates/ui2/src/components/stories/avatar.rs b/crates/ui2/src/components/stories/avatar.rs index 177065cfcb..505ede4ecc 100644 --- a/crates/ui2/src/components/stories/avatar.rs +++ b/crates/ui2/src/components/stories/avatar.rs @@ -13,11 +13,11 @@ impl Render for AvatarStory { Story::container() .child(Story::title_for::()) .child(Story::label("Default")) - .child(Avatar::new( - "https://avatars.githubusercontent.com/u/1714999?v=4".into(), + .child(Avatar::uri( + "https://avatars.githubusercontent.com/u/1714999?v=4", )) - .child(Avatar::new( - "https://avatars.githubusercontent.com/u/326587?v=4".into(), + .child(Avatar::uri( + "https://avatars.githubusercontent.com/u/326587?v=4", )) } } From 9590f253a924334cd451db30516ff72a9ea209ff Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:46:07 +0100 Subject: [PATCH 11/19] Fix warnings --- crates/call2/src/call2.rs | 9 ++---- crates/call2/src/room.rs | 9 ++---- crates/call2/src/shared_screen.rs | 20 ++++--------- crates/collab_ui2/src/collab_panel.rs | 14 ++++++--- crates/collab_ui2/src/collab_titlebar_item.rs | 27 ++++++++++------- crates/collab_ui2/src/collab_ui.rs | 8 ++--- .../incoming_call_notification.rs | 29 +++++++++---------- 7 files changed, 56 insertions(+), 60 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 5933f7404f..f9a7e4bcfa 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -18,7 +18,6 @@ use gpui::{ Subscription, Task, View, ViewContext, VisualContext, WeakModel, WeakView, }; pub use participant::ParticipantLocation; -use participant::RemoteParticipant; use postage::watch; use project::Project; use room::Event; @@ -666,7 +665,7 @@ impl CallHandler for Call { call.0.update(cx, |this, cx| { this.room().map(|room| { room.update(cx, |this, cx| { - this.toggle_mute(cx); + this.toggle_mute(cx).log_err(); }) }) }) @@ -678,12 +677,10 @@ impl CallHandler for Call { this.room().map(|room| { room.update(cx, |this, cx| { if this.is_screen_sharing() { - dbg!("Unsharing"); - this.unshare_screen(cx); + this.unshare_screen(cx).log_err(); } else { - dbg!("Sharing"); let t = this.share_screen(cx); - cx.spawn(move |_, cx| async move { + cx.spawn(move |_, _| async move { t.await.log_err(); }) .detach(); diff --git a/crates/call2/src/room.rs b/crates/call2/src/room.rs index 5bba4cc750..1f299ff6cb 100644 --- a/crates/call2/src/room.rs +++ b/crates/call2/src/room.rs @@ -1,7 +1,4 @@ -use crate::{ - call_settings::CallSettings, - participant::{LocalParticipant, ParticipantLocation, RemoteParticipant}, -}; +use crate::participant::{LocalParticipant, ParticipantLocation, RemoteParticipant}; use anyhow::{anyhow, Result}; use audio::{Audio, Sound}; use client::{ @@ -21,7 +18,6 @@ use live_kit_client::{ }; use postage::{sink::Sink, stream::Stream, watch}; use project::Project; -use settings::Settings; use std::{future::Future, mem, sync::Arc, time::Duration}; use util::{post_inc, ResultExt, TryFutureExt}; @@ -332,7 +328,8 @@ impl Room { } } - pub fn mute_on_join(cx: &AppContext) -> bool { + pub fn mute_on_join(_cx: &AppContext) -> bool { + // todo!() po: This should be uncommented, though then unmuting does not work false //CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some() } diff --git a/crates/call2/src/shared_screen.rs b/crates/call2/src/shared_screen.rs index a281948d6f..6f0024b63d 100644 --- a/crates/call2/src/shared_screen.rs +++ b/crates/call2/src/shared_screen.rs @@ -3,19 +3,11 @@ use anyhow::Result; use client::{proto::PeerId, User}; use futures::StreamExt; use gpui::{ - div, img, AppContext, Div, Element, Entity, EventEmitter, FocusHandle, FocusableView, - ImageData, Img, MouseButton, ParentElement, Render, SharedString, Task, View, ViewContext, - VisualContext, WindowContext, -}; -use smallvec::SmallVec; -use std::{ - borrow::Cow, - sync::{Arc, Weak}, -}; -use workspace::{ - item::{Item, ItemEvent}, - ItemNavHistory, WorkspaceId, + div, img, AppContext, Div, Element, EventEmitter, FocusHandle, FocusableView, ImageData, + ParentElement, Render, SharedString, Task, View, ViewContext, VisualContext, WindowContext, }; +use std::sync::{Arc, Weak}; +use workspace::{item::Item, ItemNavHistory, WorkspaceId}; pub enum Event { Close, @@ -65,13 +57,13 @@ impl EventEmitter for SharedScreen {} impl EventEmitter for SharedScreen {} impl FocusableView for SharedScreen { - fn focus_handle(&self, cx: &AppContext) -> FocusHandle { + fn focus_handle(&self, _: &AppContext) -> FocusHandle { self.focus.clone() } } impl Render for SharedScreen { type Element = Div; - fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + fn render(&mut self, _: &mut ViewContext) -> Self::Element { let frame = self.frame.clone(); div().children(frame.map(|frame| { img().data(Arc::new(ImageData::new(image::ImageBuffer::new( diff --git a/crates/collab_ui2/src/collab_panel.rs b/crates/collab_ui2/src/collab_panel.rs index 22a8a2cbba..e9c17a6589 100644 --- a/crates/collab_ui2/src/collab_panel.rs +++ b/crates/collab_ui2/src/collab_panel.rs @@ -302,7 +302,7 @@ pub struct CollabPanel { // entries: Vec, // selection: Option, user_store: Model, - client: Arc, + _client: Arc, // channel_store: ModelHandle, // project: ModelHandle, // match_candidates: Vec, @@ -605,7 +605,7 @@ impl CollabPanel { // collapsed_sections: vec![Section::Offline], // collapsed_channels: Vec::default(), _workspace: workspace.weak_handle(), - client: workspace.app_state().client.clone(), + _client: workspace.app_state().client.clone(), // context_menu_on_selected: true, // drag_target_channel: ChannelDragTarget::None, // list_state, @@ -3323,8 +3323,14 @@ impl Render for CollabPanel { .child(Label::new(contact.user.github_login.clone())) .on_mouse_down(gpui::MouseButton::Left, { let workspace = workspace.clone(); - move |event, cx| { - workspace.update(cx, |this, cx| this.call_state().invite(id, None, cx)); + move |_, cx| { + workspace + .update(cx, |this, cx| { + this.call_state() + .invite(id, None, cx) + .detach_and_log_err(cx) + }) + .log_err(); } }) })) diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 9386d3ff35..25a4db8c90 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -37,7 +37,7 @@ use gpui::{ }; use project::Project; use theme::ActiveTheme; -use ui::{h_stack, Avatar, Button, ButtonVariant, Color, IconButton, KeyBinding, Label, Tooltip}; +use ui::{h_stack, Avatar, Button, ButtonVariant, Color, IconButton, KeyBinding, Tooltip}; use util::ResultExt; use workspace::Workspace; @@ -190,11 +190,12 @@ impl Render for CollabTitlebarItem { .child(Avatar::data(avatar.clone()).into_element()) .on_mouse_down(MouseButton::Left, { let workspace = workspace.clone(); - let id = peer_id.clone(); move |_, cx| { - workspace.update(cx, |this, cx| { - this.open_shared_screen(peer_id, cx); - }); + workspace + .update(cx, |this, cx| { + this.open_shared_screen(peer_id, cx); + }) + .log_err(); } }) }) @@ -215,17 +216,21 @@ impl Render for CollabTitlebarItem { .child(IconButton::new("mute-microphone", mic_icon).on_click({ let workspace = workspace.clone(); move |_, cx| { - workspace.update(cx, |this, cx| { - this.call_state().toggle_mute(cx); - }); + workspace + .update(cx, |this, cx| { + this.call_state().toggle_mute(cx); + }) + .log_err(); } })) .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) .child(IconButton::new("screen-share", ui::Icon::Screen).on_click( move |_, cx| { - workspace.update(cx, |this, cx| { - this.call_state().toggle_screen_share(cx); - }); + workspace + .update(cx, |this, cx| { + this.call_state().toggle_screen_share(cx); + }) + .log_err(); }, )) .pl_2(), diff --git a/crates/collab_ui2/src/collab_ui.rs b/crates/collab_ui2/src/collab_ui.rs index d1e4bea7d6..679a6a135b 100644 --- a/crates/collab_ui2/src/collab_ui.rs +++ b/crates/collab_ui2/src/collab_ui.rs @@ -12,8 +12,8 @@ use std::{rc::Rc, sync::Arc}; pub use collab_panel::CollabPanel; pub use collab_titlebar_item::CollabTitlebarItem; use gpui::{ - point, px, AppContext, GlobalPixels, Pixels, PlatformDisplay, Point, Size, WindowBounds, - WindowKind, WindowOptions, + AppContext, GlobalPixels, Pixels, PlatformDisplay, Size, WindowBounds, WindowKind, + WindowOptions, }; pub use panel_settings::{ ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings, @@ -102,10 +102,10 @@ fn notification_window_options( screen: Rc, window_size: Size, ) -> WindowOptions { - let notification_padding = Pixels::from(16.); + let _notification_padding = Pixels::from(16.); let screen_bounds = screen.bounds(); - let size: Size = window_size.into(); + let _size: Size = window_size.into(); let bounds = gpui::Bounds:: { origin: screen_bounds.origin, diff --git a/crates/collab_ui2/src/notifications/incoming_call_notification.rs b/crates/collab_ui2/src/notifications/incoming_call_notification.rs index f47fcf0751..b139afcc2f 100644 --- a/crates/collab_ui2/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui2/src/notifications/incoming_call_notification.rs @@ -1,11 +1,9 @@ use crate::notification_window_options; use call::{ActiveCall, IncomingCall}; -use client::proto; use futures::StreamExt; use gpui::{ - blue, div, green, px, red, AnyElement, AppContext, Component, Context, Div, Element, Entity, - EventEmitter, GlobalPixels, ParentElement, Render, RenderOnce, StatefulInteractiveElement, - Styled, View, ViewContext, VisualContext as _, WindowHandle, + div, green, px, red, AppContext, Div, Element, ParentElement, Render, RenderOnce, + StatefulInteractiveElement, Styled, ViewContext, VisualContext as _, WindowHandle, }; use std::sync::{Arc, Weak}; use ui::{h_stack, v_stack, Avatar, Button, Label}; @@ -19,11 +17,12 @@ pub fn init(app_state: &Arc, cx: &mut AppContext) { let mut notification_windows: Vec> = Vec::new(); while let Some(incoming_call) = incoming_call.next().await { for window in notification_windows.drain(..) { - window.update(&mut cx, |this, cx| { - //cx.remove_window(); - }); - //cx.update_window(window.into(), |this, cx| cx.remove_window()); - //window.remove(&mut cx); + window + .update(&mut cx, |_, _| { + // todo!() + //cx.remove_window(); + }) + .log_err(); } if let Some(incoming_call) = incoming_call { @@ -85,15 +84,14 @@ impl IncomingCallNotificationState { let active_call = ActiveCall::global(cx); if accept { let join = active_call.update(cx, |active_call, cx| active_call.accept_incoming(cx)); - let caller_user_id = self.call.calling_user.id; let initial_project_id = self.call.initial_project.as_ref().map(|project| project.id); let app_state = self.app_state.clone(); let cx: &mut AppContext = cx; - cx.spawn(|mut cx| async move { + cx.spawn(|cx| async move { join.await?; - if let Some(project_id) = initial_project_id { - cx.update(|cx| { - if let Some(app_state) = app_state.upgrade() { + if let Some(_project_id) = initial_project_id { + cx.update(|_cx| { + if let Some(_app_state) = app_state.upgrade() { // workspace::join_remote_project( // project_id, // caller_user_id, @@ -102,7 +100,8 @@ impl IncomingCallNotificationState { // ) // .detach_and_log_err(cx); } - }); + }) + .log_err(); } anyhow::Ok(()) }) From 714b45157b74d8b6c191423f03e26341489d4f4a Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:02:21 +0100 Subject: [PATCH 12/19] Replace unrendered frame with a frame counter Move facepile to the left hand side --- Cargo.lock | 1 + crates/call2/Cargo.toml | 1 + crates/call2/src/call2.rs | 4 ---- crates/call2/src/room.rs | 2 -- crates/call2/src/shared_screen.rs | 20 ++++++++++++------- crates/collab_ui2/src/collab_titlebar_item.rs | 1 + 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27ff88f68a..90cc0460ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1206,6 +1206,7 @@ dependencies = [ "serde_json", "settings2", "smallvec", + "ui2", "util", "workspace2", ] diff --git a/crates/call2/Cargo.toml b/crates/call2/Cargo.toml index a258cbe2cf..8dc37f68dd 100644 --- a/crates/call2/Cargo.toml +++ b/crates/call2/Cargo.toml @@ -31,6 +31,7 @@ media = { path = "../media" } project = { package = "project2", path = "../project2" } settings = { package = "settings2", path = "../settings2" } util = { path = "../util" } +ui = {package = "ui2", path = "../ui2"} workspace = {package = "workspace2", path = "../workspace2"} async-trait.workspace = true anyhow.workspace = true diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index f9a7e4bcfa..1cffc44f93 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -592,13 +592,9 @@ impl CallHandler for Call { cx: &mut ViewContext, ) -> Option> { let (call, _) = self.active_call.as_ref()?; - dbg!("A"); let room = call.read(cx).room()?.read(cx); - dbg!("B"); let participant = room.remote_participant_for_peer_id(peer_id)?; - dbg!("C"); let track = participant.video_tracks.values().next()?.clone(); - dbg!("D"); let user = participant.user.clone(); for item in pane.read(cx).items_of_type::() { if item.read(cx).peer_id == peer_id { diff --git a/crates/call2/src/room.rs b/crates/call2/src/room.rs index 1f299ff6cb..b55d3348dc 100644 --- a/crates/call2/src/room.rs +++ b/crates/call2/src/room.rs @@ -1342,8 +1342,6 @@ impl Room { let display = displays .first() .ok_or_else(|| anyhow!("no display found"))?; - dbg!("Been there"); - dbg!(displays.len()); let track = LocalVideoTrack::screen_share_for_display(&display); this.upgrade() .ok_or_else(|| anyhow!("room was dropped"))? diff --git a/crates/call2/src/shared_screen.rs b/crates/call2/src/shared_screen.rs index 6f0024b63d..7b7cd7d9df 100644 --- a/crates/call2/src/shared_screen.rs +++ b/crates/call2/src/shared_screen.rs @@ -3,8 +3,8 @@ use anyhow::Result; use client::{proto::PeerId, User}; use futures::StreamExt; use gpui::{ - div, img, AppContext, Div, Element, EventEmitter, FocusHandle, FocusableView, ImageData, - ParentElement, Render, SharedString, Task, View, ViewContext, VisualContext, WindowContext, + div, AppContext, Div, Element, EventEmitter, FocusHandle, FocusableView, ParentElement, Render, + SharedString, Task, View, ViewContext, VisualContext, WindowContext, }; use std::sync::{Arc, Weak}; use workspace::{item::Item, ItemNavHistory, WorkspaceId}; @@ -16,6 +16,8 @@ pub enum Event { pub struct SharedScreen { track: Weak, frame: Option, + // temporary addition just to render something interactive. + current_frame_id: usize, pub peer_id: PeerId, user: Arc, nav_history: Option, @@ -49,6 +51,7 @@ impl SharedScreen { Ok(()) }), focus: cx.focus_handle(), + current_frame_id: 0, } } } @@ -65,11 +68,14 @@ impl Render for SharedScreen { type Element = Div; fn render(&mut self, _: &mut ViewContext) -> Self::Element { let frame = self.frame.clone(); - div().children(frame.map(|frame| { - img().data(Arc::new(ImageData::new(image::ImageBuffer::new( - frame.width() as u32, - frame.height() as u32, - )))) + let frame_id = self.current_frame_id; + self.current_frame_id = self.current_frame_id.wrapping_add(1); + div().children(frame.map(|_| { + ui::Label::new(frame_id.to_string()).color(ui::Color::Error) + // img().data(Arc::new(ImageData::new(image::ImageBuffer::new( + // frame.width() as u32, + // frame.height() as u32, + // )))) })) } } diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 25a4db8c90..67b7d8d1a2 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -203,6 +203,7 @@ impl Render for CollabTitlebarItem { ) }, ) + .child(div().flex_1()) .when(is_in_room, |this| { this.child( h_stack() From bf4211b03a1357590f98b96f3cc2c859ebc0b194 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:56:51 +0100 Subject: [PATCH 13/19] Use facepile for avatars --- crates/collab_ui2/src/collab_titlebar_item.rs | 23 ++-- crates/collab_ui2/src/face_pile.rs | 107 +++++++----------- crates/workspace2/src/workspace2.rs | 2 - 3 files changed, 54 insertions(+), 78 deletions(-) diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 67b7d8d1a2..0ba5c3e707 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -31,9 +31,9 @@ use std::sync::Arc; use call::ActiveCall; use client::{Client, UserStore}; use gpui::{ - div, px, rems, AppContext, Div, InteractiveElement, IntoElement, Model, MouseButton, - ParentElement, Render, Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, - VisualContext, WeakView, WindowBounds, + div, px, rems, AppContext, Div, Element, InteractiveElement, IntoElement, Model, MouseButton, + ParentElement, Render, RenderOnce, Stateful, StatefulInteractiveElement, Styled, Subscription, + ViewContext, VisualContext, WeakView, WindowBounds, }; use project::Project; use theme::ActiveTheme; @@ -41,6 +41,8 @@ use ui::{h_stack, Avatar, Button, ButtonVariant, Color, IconButton, KeyBinding, use util::ResultExt; use workspace::Workspace; +use crate::face_pile::FacePile; + // const MAX_PROJECT_NAME_LENGTH: usize = 40; // const MAX_BRANCH_NAME_LENGTH: usize = 40; @@ -178,16 +180,21 @@ impl Render for CollabTitlebarItem { .when_some( users.zip(current_user.clone()), |this, (remote_participants, current_user)| { - this.children( + let mut pile = FacePile::default(); + pile.extend( current_user .avatar .clone() - .map(|avatar| div().child(Avatar::data(avatar.clone()))) + .map(|avatar| { + div().child(Avatar::data(avatar.clone())).into_any_element() + }) .into_iter() .chain(remote_participants.into_iter().flat_map(|(user, peer_id)| { user.avatar.as_ref().map(|avatar| { div() - .child(Avatar::data(avatar.clone()).into_element()) + .child( + Avatar::data(avatar.clone()).into_element().into_any(), + ) .on_mouse_down(MouseButton::Left, { let workspace = workspace.clone(); move |_, cx| { @@ -198,9 +205,11 @@ impl Render for CollabTitlebarItem { .log_err(); } }) + .into_any_element() }) })), - ) + ); + this.child(pile.render(cx)) }, ) .child(div().flex_1()) diff --git a/crates/collab_ui2/src/face_pile.rs b/crates/collab_ui2/src/face_pile.rs index 077b813fbd..953470b854 100644 --- a/crates/collab_ui2/src/face_pile.rs +++ b/crates/collab_ui2/src/face_pile.rs @@ -1,54 +1,50 @@ -// use std::ops::Range; +use gpui::{ + div, AnyElement, Div, IntoElement as _, ParentElement as _, Render, RenderOnce, Styled, + ViewContext, WindowContext, +}; +use ui::Avatar; -// use gpui::{ -// geometry::{ -// rect::RectF, -// vector::{vec2f, Vector2F}, -// }, -// json::ToJson, -// serde_json::{self, json}, -// AnyElement, Axis, Element, View, ViewContext, -// }; +#[derive(Default)] +pub(crate) struct FacePile { + faces: Vec, +} -// pub(crate) struct FacePile { -// overlap: f32, -// faces: Vec>, -// } +impl RenderOnce for FacePile { + type Rendered = Div; -// impl FacePile { -// pub fn new(overlap: f32) -> Self { -// Self { -// overlap, -// faces: Vec::new(), -// } -// } -// } + fn render(self, _: &mut WindowContext) -> Self::Rendered { + let player_count = self.faces.len(); + let player_list = self.faces.into_iter().enumerate().map(|(ix, player)| { + let isnt_last = ix < player_count - 1; -// impl Element for FacePile { -// type LayoutState = (); -// type PaintState = (); + div().when(isnt_last, |div| div.neg_mr_2()).child(player) + }); + div().p_1().flex().items_center().children(player_list) + } +} +// impl Element for FacePile { +// type State = (); // fn layout( // &mut self, -// constraint: gpui::SizeConstraint, -// view: &mut V, -// cx: &mut ViewContext, -// ) -> (Vector2F, Self::LayoutState) { -// debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY); - +// state: Option, +// cx: &mut WindowContext, +// ) -> (LayoutId, Self::State) { // let mut width = 0.; // let mut max_height = 0.; +// let mut faces = Vec::with_capacity(self.faces.len()); // for face in &mut self.faces { -// let layout = face.layout(constraint, view, cx); +// let layout = face.layout(cx); // width += layout.x(); // max_height = f32::max(max_height, layout.y()); +// faces.push(layout); // } // width -= self.overlap * self.faces.len().saturating_sub(1) as f32; - -// ( -// Vector2F::new(width, max_height.clamp(1., constraint.max.y())), -// (), -// ) +// (cx.request_layout(&Style::default(), faces), ()) +// // ( +// // Vector2F::new(width, max_height.clamp(1., constraint.max.y())), +// // (), +// // )) // } // fn paint( @@ -77,37 +73,10 @@ // () // } - -// fn rect_for_text_range( -// &self, -// _: Range, -// _: RectF, -// _: RectF, -// _: &Self::LayoutState, -// _: &Self::PaintState, -// _: &V, -// _: &ViewContext, -// ) -> Option { -// None -// } - -// fn debug( -// &self, -// bounds: RectF, -// _: &Self::LayoutState, -// _: &Self::PaintState, -// _: &V, -// _: &ViewContext, -// ) -> serde_json::Value { -// json!({ -// "type": "FacePile", -// "bounds": bounds.to_json() -// }) -// } // } -// impl Extend> for FacePile { -// fn extend>>(&mut self, children: T) { -// self.faces.extend(children); -// } -// } +impl Extend for FacePile { + fn extend>(&mut self, children: T) { + self.faces.extend(children); + } +} diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index fd52276ef4..73bfc63332 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -2003,8 +2003,6 @@ impl Workspace { self.active_pane.update(cx, |pane, cx| { pane.add_item(shared_screen, false, true, None, cx) }); - } else { - dbg!("WTF"); } } From a71180257d1c63c1dca670290d50776b91d75730 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:12:13 +0100 Subject: [PATCH 14/19] Add deafening support --- crates/call2/src/call2.rs | 23 +++++++++++++++++++ crates/collab_ui2/src/collab_titlebar_item.rs | 22 +++++++++++++++++- crates/collab_ui2/src/face_pile.rs | 2 +- crates/workspace2/src/workspace2.rs | 8 +++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 1cffc44f93..d983af50b7 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -686,6 +686,29 @@ impl CallHandler for Call { }) }); } + fn toggle_deafen(&self, cx: &mut AppContext) { + self.active_call.as_ref().map(|call| { + call.0.update(cx, |this, cx| { + this.room().map(|room| { + room.update(cx, |this, cx| { + this.toggle_deafen(cx).log_err(); + }) + }) + }) + }); + } + fn is_deafened(&self, cx: &AppContext) -> Option { + self.active_call + .as_ref() + .map(|call| { + call.0 + .read(cx) + .room() + .map(|room| room.read(cx).is_deafened()) + }) + .flatten() + .flatten() + } } #[cfg(test)] diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 0ba5c3e707..a58186d0f0 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -111,6 +111,17 @@ impl Render for CollabTitlebarItem { } else { ui::Icon::Mic }; + let speakers_icon = if self + .workspace + .update(cx, |this, cx| this.call_state().is_deafened(cx)) + .log_err() + .flatten() + .unwrap_or_default() + { + ui::Icon::AudioOff + } else { + ui::Icon::AudioOn + }; let workspace = self.workspace.clone(); h_stack() .id("titlebar") @@ -233,7 +244,16 @@ impl Render for CollabTitlebarItem { .log_err(); } })) - .child(IconButton::new("mute-sound", ui::Icon::AudioOn)) + .child(IconButton::new("mute-sound", speakers_icon).on_click({ + let workspace = workspace.clone(); + move |_, cx| { + workspace + .update(cx, |this, cx| { + this.call_state().toggle_deafen(cx); + }) + .log_err(); + } + })) .child(IconButton::new("screen-share", ui::Icon::Screen).on_click( move |_, cx| { workspace diff --git a/crates/collab_ui2/src/face_pile.rs b/crates/collab_ui2/src/face_pile.rs index 953470b854..61a2ef85b5 100644 --- a/crates/collab_ui2/src/face_pile.rs +++ b/crates/collab_ui2/src/face_pile.rs @@ -17,7 +17,7 @@ impl RenderOnce for FacePile { let player_list = self.faces.into_iter().enumerate().map(|(ix, player)| { let isnt_last = ix < player_count - 1; - div().when(isnt_last, |div| div.neg_mr_2()).child(player) + div().when(isnt_last, |div| div.neg_mr_1()).child(player) }); div().p_1().flex().items_center().children(player_list) } diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 73bfc63332..f906a19498 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -371,6 +371,12 @@ impl CallHandler for TestCallHandler { fn toggle_mute(&self, cx: &mut AppContext) {} fn toggle_screen_share(&self, cx: &mut AppContext) {} + + fn toggle_deafen(&self, cx: &mut AppContext) {} + + fn is_deafened(&self, cx: &AppContext) -> Option { + None + } } impl AppState { @@ -483,7 +489,9 @@ pub trait CallHandler { ) -> Task>; fn remote_participants(&self, cx: &AppContext) -> Option, PeerId)>>; fn is_muted(&self, cx: &AppContext) -> Option; + fn is_deafened(&self, cx: &AppContext) -> Option; fn toggle_mute(&self, cx: &mut AppContext); + fn toggle_deafen(&self, cx: &mut AppContext); fn toggle_screen_share(&self, cx: &mut AppContext); } From 44876062c95838a05bf3f506319dfe3da6d261eb Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:44:19 +0100 Subject: [PATCH 15/19] Use AppContext instead of AsyncWindowContext to quit Fixes refcell-related panic --- crates/call2/src/call2.rs | 6 +++--- crates/collab_ui2/src/collab_titlebar_item.rs | 9 ++++++++- crates/workspace2/src/workspace2.rs | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index d983af50b7..534964b3c2 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -609,12 +609,12 @@ impl CallHandler for Call { fn room_id(&self, cx: &AppContext) -> Option { Some(self.active_call.as_ref()?.0.read(cx).room()?.read(cx).id()) } - fn hang_up(&self, mut cx: AsyncWindowContext) -> Result>> { + fn hang_up(&self, mut cx: &mut AppContext) -> Task> { let Some((call, _)) = self.active_call.as_ref() else { - bail!("Cannot exit a call; not in a call"); + return Task::ready(Err(anyhow!("Cannot exit a call; not in a call"))); }; - call.update(&mut cx, |this, cx| this.hang_up(cx)) + call.update(cx, |this, cx| this.hang_up(cx)) } fn active_project(&self, cx: &AppContext) -> Option> { ActiveCall::global(cx).read(cx).location().cloned() diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index a58186d0f0..bfa2932aee 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -230,7 +230,14 @@ impl Render for CollabTitlebarItem { .child( h_stack() .child(Button::new(if is_shared { "Unshare" } else { "Share" })) - .child(IconButton::new("leave-call", ui::Icon::Exit)), + .child(IconButton::new("leave-call", ui::Icon::Exit).on_click({ + let workspace = workspace.clone(); + move |_, cx| { + workspace.update(cx, |this, cx| { + this.call_state().hang_up(cx).detach(); + }); + } + })), ) .child( h_stack() diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index f906a19498..135a713661 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -479,7 +479,7 @@ pub trait CallHandler { fn is_in_room(&self, cx: &mut ViewContext) -> bool { self.room_id(cx).is_some() } - fn hang_up(&self, cx: AsyncWindowContext) -> Result>>; + fn hang_up(&self, cx: &mut AppContext) -> Task>; fn active_project(&self, cx: &AppContext) -> Option>; fn invite( &mut self, @@ -1222,7 +1222,7 @@ impl Workspace { if answer.await.log_err() == Some(1) { return anyhow::Ok(false); } else { - this.update(&mut cx, |this, cx| this.call_handler.hang_up(cx.to_async()))?? + this.update(&mut cx, |this, cx| this.call_handler.hang_up(cx))? .await .log_err(); } From 30af3ffaf39c689a154b5756d76722acc3d14c32 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:47:00 +0100 Subject: [PATCH 16/19] fixup! Use AppContext instead of AsyncWindowContext to quit --- crates/workspace2/src/workspace2.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 135a713661..a649a8696a 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -343,8 +343,8 @@ impl CallHandler for TestCallHandler { None } - fn hang_up(&self, cx: AsyncWindowContext) -> Result>> { - anyhow::bail!("TestCallHandler should not be hanging up") + fn hang_up(&self, cx: &mut AppContext) -> Task> { + Task::ready(Err(anyhow!("TestCallHandler should not be hanging up"))) } fn active_project(&self, cx: &AppContext) -> Option> { From 8ca9f4e12a6a69ff63b748c320b10f9a42ec37da Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:49:47 +0100 Subject: [PATCH 17/19] Fix some more warnings --- crates/call2/src/call2.rs | 8 ++++---- crates/collab_ui2/src/collab_titlebar_item.rs | 8 +++++--- crates/collab_ui2/src/face_pile.rs | 4 +--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 534964b3c2..9a89ec7167 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -3,7 +3,7 @@ pub mod participant; pub mod room; mod shared_screen; -use anyhow::{anyhow, bail, Result}; +use anyhow::{anyhow, Result}; use async_trait::async_trait; use audio::Audio; use call_settings::CallSettings; @@ -14,8 +14,8 @@ use client::{ use collections::HashSet; use futures::{channel::oneshot, future::Shared, Future, FutureExt}; use gpui::{ - AppContext, AsyncAppContext, AsyncWindowContext, Context, EventEmitter, Model, ModelContext, - Subscription, Task, View, ViewContext, VisualContext, WeakModel, WeakView, + AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Subscription, Task, + View, ViewContext, VisualContext, WeakModel, WeakView, }; pub use participant::ParticipantLocation; use postage::watch; @@ -609,7 +609,7 @@ impl CallHandler for Call { fn room_id(&self, cx: &AppContext) -> Option { Some(self.active_call.as_ref()?.0.read(cx).room()?.read(cx).id()) } - fn hang_up(&self, mut cx: &mut AppContext) -> Task> { + fn hang_up(&self, cx: &mut AppContext) -> Task> { let Some((call, _)) = self.active_call.as_ref() else { return Task::ready(Err(anyhow!("Cannot exit a call; not in a call"))); }; diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index bfa2932aee..b5ed8b0919 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -233,9 +233,11 @@ impl Render for CollabTitlebarItem { .child(IconButton::new("leave-call", ui::Icon::Exit).on_click({ let workspace = workspace.clone(); move |_, cx| { - workspace.update(cx, |this, cx| { - this.call_state().hang_up(cx).detach(); - }); + workspace + .update(cx, |this, cx| { + this.call_state().hang_up(cx).detach(); + }) + .log_err(); } })), ) diff --git a/crates/collab_ui2/src/face_pile.rs b/crates/collab_ui2/src/face_pile.rs index 61a2ef85b5..e235f33ce6 100644 --- a/crates/collab_ui2/src/face_pile.rs +++ b/crates/collab_ui2/src/face_pile.rs @@ -1,8 +1,6 @@ use gpui::{ - div, AnyElement, Div, IntoElement as _, ParentElement as _, Render, RenderOnce, Styled, - ViewContext, WindowContext, + div, AnyElement, Div, IntoElement as _, ParentElement as _, RenderOnce, Styled, WindowContext, }; -use ui::Avatar; #[derive(Default)] pub(crate) struct FacePile { From b2b5df442889b9820d447e48d29a8fe5121afd4c Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 18:57:25 +0100 Subject: [PATCH 18/19] close notification handler proper on accept/decline Co-authored-by: Conrad --- .../src/notifications/incoming_call_notification.rs | 4 ++-- crates/gpui2/src/app.rs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/collab_ui2/src/notifications/incoming_call_notification.rs b/crates/collab_ui2/src/notifications/incoming_call_notification.rs index b139afcc2f..24db39683d 100644 --- a/crates/collab_ui2/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui2/src/notifications/incoming_call_notification.rs @@ -18,9 +18,9 @@ pub fn init(app_state: &Arc, cx: &mut AppContext) { while let Some(incoming_call) = incoming_call.next().await { for window in notification_windows.drain(..) { window - .update(&mut cx, |_, _| { + .update(&mut cx, |_, cx| { // todo!() - //cx.remove_window(); + cx.remove_window(); }) .log_err(); } diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs index 617c0b5600..e8f2a60a6a 100644 --- a/crates/gpui2/src/app.rs +++ b/crates/gpui2/src/app.rs @@ -580,7 +580,7 @@ impl AppContext { .windows .iter() .filter_map(|(_, window)| { - let window = window.as_ref().unwrap(); + let window = window.as_ref()?; if window.dirty { Some(window.handle.clone()) } else { @@ -1049,7 +1049,9 @@ impl Context for AppContext { let root_view = window.root_view.clone().unwrap(); let result = update(root_view, &mut WindowContext::new(cx, &mut window)); - if !window.removed { + if window.removed { + cx.windows.remove(handle.id); + } else { cx.windows .get_mut(handle.id) .ok_or_else(|| anyhow!("window not found"))? From 1c2f906e4837ce897f8d3569942c47981e4efc86 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 27 Nov 2023 19:37:04 +0100 Subject: [PATCH 19/19] Position incoming call notification on right hand side. Co-authored-by: Conrad --- crates/collab_ui2/src/collab_ui.rs | 14 ++++++++++---- .../notifications/incoming_call_notification.rs | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/crates/collab_ui2/src/collab_ui.rs b/crates/collab_ui2/src/collab_ui.rs index 679a6a135b..57a33c6790 100644 --- a/crates/collab_ui2/src/collab_ui.rs +++ b/crates/collab_ui2/src/collab_ui.rs @@ -12,7 +12,7 @@ use std::{rc::Rc, sync::Arc}; pub use collab_panel::CollabPanel; pub use collab_titlebar_item::CollabTitlebarItem; use gpui::{ - AppContext, GlobalPixels, Pixels, PlatformDisplay, Size, WindowBounds, WindowKind, + point, AppContext, GlobalPixels, Pixels, PlatformDisplay, Size, WindowBounds, WindowKind, WindowOptions, }; pub use panel_settings::{ @@ -102,13 +102,19 @@ fn notification_window_options( screen: Rc, window_size: Size, ) -> WindowOptions { - let _notification_padding = Pixels::from(16.); + let notification_margin_width = GlobalPixels::from(16.); + let notification_margin_height = GlobalPixels::from(-0.) - GlobalPixels::from(48.); let screen_bounds = screen.bounds(); - let _size: Size = window_size.into(); + let size: Size = window_size.into(); + // todo!() use content bounds instead of screen.bounds and get rid of magics in point's 2nd argument. let bounds = gpui::Bounds:: { - origin: screen_bounds.origin, + origin: screen_bounds.upper_right() + - point( + size.width + notification_margin_width, + notification_margin_height, + ), size: window_size.into(), }; WindowOptions { diff --git a/crates/collab_ui2/src/notifications/incoming_call_notification.rs b/crates/collab_ui2/src/notifications/incoming_call_notification.rs index 24db39683d..0519b6fc4a 100644 --- a/crates/collab_ui2/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui2/src/notifications/incoming_call_notification.rs @@ -34,7 +34,6 @@ pub fn init(app_state: &Arc, cx: &mut AppContext) { for window in unique_screens { let options = notification_window_options(window, window_size); - dbg!(&options); let window = cx .open_window(options, |cx| { cx.build_view(|_| {