zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Nathan Sobo 2023-04-12 10:28:53 -06:00
parent 868301bedb
commit 40896352ff
14 changed files with 176 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/breadcrumbs/src/breadcrumbs.rs
View File

@ -72,14 +72,14 @@ impl View for Breadcrumbs {
.boxed(); .boxed();
} }
MouseEventHandler::<Breadcrumbs>::new(0, cx, |state, _| { MouseEventHandler::<Breadcrumbs, Breadcrumbs>::new(0, cx, |state, _| {
let style = style.style_for(state, false); let style = style.style_for(state, false);
crumbs.with_style(style.container).boxed() crumbs.with_style(style.container).boxed()
}) })
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(outline::Toggle); cx.dispatch_action(outline::Toggle);
}) })
.with_tooltip::<Breadcrumbs, _>( .with_tooltip::<Breadcrumbs>(
0, 0,
"Show symbol outline".to_owned(), "Show symbol outline".to_owned(),
Some(Box::new(outline::Toggle)), Some(Box::new(outline::Toggle)),

5
crates/collab/src/tests/integration_tests.rs
View File

@ -1467,7 +1467,8 @@ async fn test_host_disconnect(
deterministic.run_until_parked(); deterministic.run_until_parked();
assert!(worktree_a.read_with(cx_a, |tree, _| tree.as_local().unwrap().is_shared())); assert!(worktree_a.read_with(cx_a, |tree, _| tree.as_local().unwrap().is_shared()));
let (_, workspace_b) = cx_b.add_window(|cx| Workspace::test_new(project_b.clone(), cx)); let (window_id_b, workspace_b) =
cx_b.add_window(|cx| Workspace::test_new(project_b.clone(), cx));
let editor_b = workspace_b let editor_b = workspace_b
.update(cx_b, |workspace, cx| { .update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "b.txt"), None, true, cx) workspace.open_path((worktree_id, "b.txt"), None, true, cx)
@ -1490,7 +1491,7 @@ async fn test_host_disconnect(
assert!(worktree_a.read_with(cx_a, |tree, _| !tree.as_local().unwrap().is_shared())); assert!(worktree_a.read_with(cx_a, |tree, _| !tree.as_local().unwrap().is_shared()));
// Ensure client B's edited state is reset and that the whole window is blurred. // Ensure client B's edited state is reset and that the whole window is blurred.
cx_b.read_window(|cx| { cx_b.read_window(window_id_b, |cx| {
assert_eq!(cx.focused_view_id(), None); assert_eq!(cx.focused_view_id(), None);
}); });
assert!(!cx_b.is_window_edited(workspace_b.window_id())); assert!(!cx_b.is_window_edited(workspace_b.window_id()));

132
crates/collab_ui/src/collab_titlebar_item.rs
View File

@ -16,8 +16,8 @@ use gpui::{
impl_internal_actions, impl_internal_actions,
json::{self, ToJson}, json::{self, ToJson},
platform::{CursorStyle, MouseButton}, platform::{CursorStyle, MouseButton},
AppContext, Entity, ImageData, ModelHandle, Subscription, View, ViewContext, ViewHandle, AppContext, Entity, ImageData, ModelHandle, SceneBuilder, Subscription, View, ViewContext,
WeakViewHandle, ViewHandle, WeakViewHandle,
}; };
use settings::Settings; use settings::Settings;
use std::{ops::Range, sync::Arc}; use std::{ops::Range, sync::Arc};
@ -68,7 +68,7 @@ impl View for CollabTitlebarItem {
"CollabTitlebarItem" "CollabTitlebarItem"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let workspace = if let Some(workspace) = self.workspace.upgrade(cx) { let workspace = if let Some(workspace) = self.workspace.upgrade(cx) {
workspace workspace
} else { } else {
@ -326,7 +326,7 @@ impl CollabTitlebarItem {
&self, &self,
theme: &Theme, theme: &Theme,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let titlebar = &theme.workspace.titlebar; let titlebar = &theme.workspace.titlebar;
let badge = if self let badge = if self
@ -352,7 +352,7 @@ impl CollabTitlebarItem {
Stack::new() Stack::new()
.with_child( .with_child(
MouseEventHandler::<ToggleContactsMenu>::new(0, cx, |state, _| { MouseEventHandler::<ToggleContactsMenu, Self>::new(0, cx, |state, _| {
let style = titlebar let style = titlebar
.toggle_contacts_button .toggle_contacts_button
.style_for(state, self.contacts_popover.is_some()); .style_for(state, self.contacts_popover.is_some());
@ -369,10 +369,10 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleContactsMenu); cx.dispatch_action(ToggleContactsMenu);
}) })
.with_tooltip::<ToggleContactsMenu, _>( .with_tooltip::<ToggleContactsMenu>(
0, 0,
"Show contacts menu".into(), "Show contacts menu".into(),
Some(Box::new(ToggleContactsMenu)), Some(Box::new(ToggleContactsMenu)),
@ -391,7 +391,7 @@ impl CollabTitlebarItem {
theme: &Theme, theme: &Theme,
room: &ModelHandle<Room>, room: &ModelHandle<Room>,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let icon; let icon;
let tooltip; let tooltip;
if room.read(cx).is_screen_sharing() { if room.read(cx).is_screen_sharing() {
@ -403,7 +403,7 @@ impl CollabTitlebarItem {
} }
let titlebar = &theme.workspace.titlebar; let titlebar = &theme.workspace.titlebar;
MouseEventHandler::<ToggleScreenSharing>::new(0, cx, |state, _| { MouseEventHandler::<ToggleScreenSharing, Self>::new(0, cx, |state, _| {
let style = titlebar.call_control.style_for(state, false); let style = titlebar.call_control.style_for(state, false);
Svg::new(icon) Svg::new(icon)
.with_color(style.color) .with_color(style.color)
@ -418,10 +418,10 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleScreenSharing); cx.dispatch_action(ToggleScreenSharing);
}) })
.with_tooltip::<ToggleScreenSharing, _>( .with_tooltip::<ToggleScreenSharing>(
0, 0,
tooltip.into(), tooltip.into(),
Some(Box::new(ToggleScreenSharing)), Some(Box::new(ToggleScreenSharing)),
@ -437,7 +437,7 @@ impl CollabTitlebarItem {
workspace: &ViewHandle<Workspace>, workspace: &ViewHandle<Workspace>,
theme: &Theme, theme: &Theme,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Option<ElementBox> { ) -> Option<ElementBox<Self>> {
let project = workspace.read(cx).project(); let project = workspace.read(cx).project();
if project.read(cx).is_remote() { if project.read(cx).is_remote() {
return None; return None;
@ -457,7 +457,7 @@ impl CollabTitlebarItem {
Some( Some(
Stack::new() Stack::new()
.with_child( .with_child(
MouseEventHandler::<ShareUnshare>::new(0, cx, |state, _| { MouseEventHandler::<ShareUnshare, Self>::new(0, cx, |state, _| {
//TODO: Ensure this button has consistant width for both text variations //TODO: Ensure this button has consistant width for both text variations
let style = titlebar let style = titlebar
.share_button .share_button
@ -468,14 +468,14 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
if is_shared { if is_shared {
cx.dispatch_action(UnshareProject); cx.dispatch_action(UnshareProject);
} else { } else {
cx.dispatch_action(ShareProject); cx.dispatch_action(ShareProject);
} }
}) })
.with_tooltip::<ShareUnshare, _>( .with_tooltip::<ShareUnshare>(
0, 0,
tooltip.to_owned(), tooltip.to_owned(),
None, None,
@ -491,12 +491,16 @@ impl CollabTitlebarItem {
) )
} }
fn render_user_menu_button(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> ElementBox { fn render_user_menu_button(
&self,
theme: &Theme,
cx: &mut ViewContext<Self>,
) -> ElementBox<Self> {
let titlebar = &theme.workspace.titlebar; let titlebar = &theme.workspace.titlebar;
Stack::new() Stack::new()
.with_child( .with_child(
MouseEventHandler::<ToggleUserMenu>::new(0, cx, |state, _| { MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| {
let style = titlebar.call_control.style_for(state, false); let style = titlebar.call_control.style_for(state, false);
Svg::new("icons/ellipsis_14.svg") Svg::new("icons/ellipsis_14.svg")
.with_color(style.color) .with_color(style.color)
@ -511,10 +515,10 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleUserMenu); cx.dispatch_action(ToggleUserMenu);
}) })
.with_tooltip::<ToggleUserMenu, _>( .with_tooltip::<ToggleUserMenu>(
0, 0,
"Toggle user menu".to_owned(), "Toggle user menu".to_owned(),
Some(Box::new(ToggleUserMenu)), Some(Box::new(ToggleUserMenu)),
@ -535,9 +539,9 @@ impl CollabTitlebarItem {
.boxed() .boxed()
} }
fn render_sign_in_button(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> ElementBox { fn render_sign_in_button(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let titlebar = &theme.workspace.titlebar; let titlebar = &theme.workspace.titlebar;
MouseEventHandler::<SignIn>::new(0, cx, |state, _| { MouseEventHandler::<SignIn, Self>::new(0, cx, |state, _| {
let style = titlebar.sign_in_prompt.style_for(state, false); let style = titlebar.sign_in_prompt.style_for(state, false);
Label::new("Sign In", style.text.clone()) Label::new("Sign In", style.text.clone())
.contained() .contained()
@ -545,7 +549,7 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(SignIn); cx.dispatch_action(SignIn);
}) })
.boxed() .boxed()
@ -555,7 +559,7 @@ impl CollabTitlebarItem {
&'a self, &'a self,
_theme: &'a theme::Titlebar, _theme: &'a theme::Titlebar,
cx: &'a ViewContext<Self>, cx: &'a ViewContext<Self>,
) -> Option<ElementBox> { ) -> Option<ElementBox<Self>> {
self.contacts_popover.as_ref().map(|popover| { self.contacts_popover.as_ref().map(|popover| {
Overlay::new(ChildView::new(popover, cx).boxed()) Overlay::new(ChildView::new(popover, cx).boxed())
.with_fit_mode(OverlayFitMode::SwitchAnchor) .with_fit_mode(OverlayFitMode::SwitchAnchor)
@ -574,7 +578,7 @@ impl CollabTitlebarItem {
theme: &Theme, theme: &Theme,
room: &ModelHandle<Room>, room: &ModelHandle<Room>,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Vec<ElementBox> { ) -> Vec<ElementBox<Self>> {
let mut participants = room let mut participants = room
.read(cx) .read(cx)
.remote_participants() .remote_participants()
@ -616,7 +620,7 @@ impl CollabTitlebarItem {
user: &Arc<User>, user: &Arc<User>,
peer_id: PeerId, peer_id: PeerId,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let replica_id = workspace.read(cx).project().read(cx).replica_id(); let replica_id = workspace.read(cx).project().read(cx).replica_id();
Container::new(self.render_face_pile( Container::new(self.render_face_pile(
user, user,
@ -640,7 +644,7 @@ impl CollabTitlebarItem {
workspace: &ViewHandle<Workspace>, workspace: &ViewHandle<Workspace>,
theme: &Theme, theme: &Theme,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let project_id = workspace.read(cx).project().read(cx).remote_id(); let project_id = workspace.read(cx).project().read(cx).remote_id();
let room = ActiveCall::global(cx).read(cx).room(); let room = ActiveCall::global(cx).read(cx).room();
let is_being_followed = workspace.read(cx).is_being_followed(peer_id); let is_being_followed = workspace.read(cx).is_being_followed(peer_id);
@ -753,41 +757,42 @@ impl CollabTitlebarItem {
if let Some(location) = location { if let Some(location) = location {
if let Some(replica_id) = replica_id { if let Some(replica_id) = replica_id {
content = content = MouseEventHandler::<ToggleFollow, Self>::new(
MouseEventHandler::<ToggleFollow>::new(replica_id.into(), cx, move |_, _| { replica_id.into(),
content cx,
}) move |_, _| content,
.with_cursor_style(CursorStyle::PointingHand) )
.on_click(MouseButton::Left, move |_, cx| { .with_cursor_style(CursorStyle::PointingHand)
cx.dispatch_action(ToggleFollow(peer_id)) .on_click(MouseButton::Left, move |_, _, cx| {
}) cx.dispatch_action(ToggleFollow(peer_id))
.with_tooltip::<ToggleFollow, _>( })
peer_id.as_u64() as usize, .with_tooltip::<ToggleFollow>(
if is_being_followed { peer_id.as_u64() as usize,
format!("Unfollow {}", user.github_login) if is_being_followed {
} else { format!("Unfollow {}", user.github_login)
format!("Follow {}", user.github_login) } else {
}, format!("Follow {}", user.github_login)
Some(Box::new(FollowNextCollaborator)), },
theme.tooltip.clone(), Some(Box::new(FollowNextCollaborator)),
cx, theme.tooltip.clone(),
) cx,
.boxed(); )
.boxed();
} else if let ParticipantLocation::SharedProject { project_id } = location { } else if let ParticipantLocation::SharedProject { project_id } = location {
let user_id = user.id; let user_id = user.id;
content = MouseEventHandler::<JoinProject>::new( content = MouseEventHandler::<JoinProject, Self>::new(
peer_id.as_u64() as usize, peer_id.as_u64() as usize,
cx, cx,
move |_, _| content, move |_, _| content,
) )
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(JoinProject { cx.dispatch_action(JoinProject {
project_id, project_id,
follow_user_id: user_id, follow_user_id: user_id,
}) })
}) })
.with_tooltip::<JoinProject, _>( .with_tooltip::<JoinProject>(
peer_id.as_u64() as usize, peer_id.as_u64() as usize,
format!("Follow {} into external project", user.github_login), format!("Follow {} into external project", user.github_login),
Some(Box::new(FollowNextCollaborator)), Some(Box::new(FollowNextCollaborator)),
@ -823,7 +828,7 @@ impl CollabTitlebarItem {
avatar: Arc<ImageData>, avatar: Arc<ImageData>,
avatar_style: AvatarStyle, avatar_style: AvatarStyle,
background_color: Color, background_color: Color,
) -> ElementBox { ) -> ElementBox<Self> {
Image::from_data(avatar) Image::from_data(avatar)
.with_style(avatar_style.image) .with_style(avatar_style.image)
.aligned() .aligned()
@ -841,7 +846,7 @@ impl CollabTitlebarItem {
&self, &self,
status: &client::Status, status: &client::Status,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Option<ElementBox> { ) -> Option<ElementBox<Self>> {
enum ConnectionStatusButton {} enum ConnectionStatusButton {}
let theme = &cx.global::<Settings>().theme.clone(); let theme = &cx.global::<Settings>().theme.clone();
@ -867,7 +872,7 @@ impl CollabTitlebarItem {
.boxed(), .boxed(),
), ),
client::Status::UpgradeRequired => Some( client::Status::UpgradeRequired => Some(
MouseEventHandler::<ConnectionStatusButton>::new(0, cx, |_, _| { MouseEventHandler::<ConnectionStatusButton, Self>::new(0, cx, |_, _| {
Label::new( Label::new(
"Please update Zed to collaborate", "Please update Zed to collaborate",
theme.workspace.titlebar.outdated_warning.text.clone(), theme.workspace.titlebar.outdated_warning.text.clone(),
@ -878,7 +883,7 @@ impl CollabTitlebarItem {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(auto_update::Check); cx.dispatch_action(auto_update::Check);
}) })
.boxed(), .boxed(),
@ -898,7 +903,7 @@ impl AvatarRibbon {
} }
} }
impl Element for AvatarRibbon { impl Element<CollabTitlebarItem> for AvatarRibbon {
type LayoutState = (); type LayoutState = ();
type PaintState = (); type PaintState = ();
@ -906,17 +911,20 @@ impl Element for AvatarRibbon {
fn layout( fn layout(
&mut self, &mut self,
constraint: gpui::SizeConstraint, constraint: gpui::SizeConstraint,
_: &mut gpui::LayoutContext, _: &mut CollabTitlebarItem,
_: &mut ViewContext<CollabTitlebarItem>,
) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) { ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
(constraint.max, ()) (constraint.max, ())
} }
fn paint( fn paint(
&mut self, &mut self,
bounds: gpui::geometry::rect::RectF, scene: &mut SceneBuilder,
_: gpui::geometry::rect::RectF, bounds: RectF,
_: RectF,
_: &mut Self::LayoutState, _: &mut Self::LayoutState,
cx: &mut gpui::PaintContext, _: &mut CollabTitlebarItem,
_: &mut ViewContext<CollabTitlebarItem>,
) -> Self::PaintState { ) -> Self::PaintState {
let mut path = PathBuilder::new(); let mut path = PathBuilder::new();
path.reset(bounds.lower_left()); path.reset(bounds.lower_left());
@ -937,17 +945,19 @@ impl Element for AvatarRibbon {
_: RectF, _: RectF,
_: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
_: &gpui::MeasurementContext, _: &CollabTitlebarItem,
_: &ViewContext<CollabTitlebarItem>,
) -> Option<RectF> { ) -> Option<RectF> {
None None
} }
fn debug( fn debug(
&self, &self,
bounds: gpui::geometry::rect::RectF, bounds: RectF,
_: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
_: &gpui::DebugContext, _: &CollabTitlebarItem,
_: &ViewContext<CollabTitlebarItem>,
) -> gpui::json::Value { ) -> gpui::json::Value {
json::json!({ json::json!({
"type": "AvatarRibbon", "type": "AvatarRibbon",

33
crates/collab_ui/src/collaborator_list_popover.rs
View File

@ -30,10 +30,10 @@ impl View for CollaboratorListPopover {
"CollaboratorListPopover" "CollaboratorListPopover"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
MouseEventHandler::<Self>::new(0, cx, |_, _| { MouseEventHandler::<Self, Self>::new(0, cx, |_, _| {
List::new(self.list_state.clone()) List::new(self.list_state.clone())
.contained() .contained()
.with_style(theme.contacts_popover.container) //TODO: Change the name of this theme key .with_style(theme.contacts_popover.container) //TODO: Change the name of this theme key
@ -42,7 +42,7 @@ impl View for CollaboratorListPopover {
.with_height(theme.contacts_popover.height) .with_height(theme.contacts_popover.height)
.boxed() .boxed()
}) })
.on_down_out(MouseButton::Left, move |_, cx| { .on_down_out(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleCollaboratorList); cx.dispatch_action(ToggleCollaboratorList);
}) })
.boxed() .boxed()
@ -117,7 +117,7 @@ fn render_collaborator_list_entry<UA: Action + Clone, IA: Action + Clone>(
icon_action: IA, icon_action: IA,
icon_tooltip: String, icon_tooltip: String,
cx: &mut ViewContext<CollaboratorListPopover>, cx: &mut ViewContext<CollaboratorListPopover>,
) -> ElementBox { ) -> ElementBox<CollaboratorListPopover> {
enum Username {} enum Username {}
enum UsernameTooltip {} enum UsernameTooltip {}
enum Icon {} enum Icon {}
@ -127,19 +127,20 @@ fn render_collaborator_list_entry<UA: Action + Clone, IA: Action + Clone>(
let username_theme = theme.contact_list.contact_username.text.clone(); let username_theme = theme.contact_list.contact_username.text.clone();
let tooltip_theme = theme.tooltip.clone(); let tooltip_theme = theme.tooltip.clone();
let username = MouseEventHandler::<Username>::new(index, cx, |_, _| { let username =
Label::new(username.to_owned(), username_theme.clone()).boxed() MouseEventHandler::<Username, CollaboratorListPopover>::new(index, cx, |_, _| {
}) Label::new(username.to_owned(), username_theme.clone()).boxed()
.on_click(MouseButton::Left, move |_, cx| { })
if let Some(username_action) = username_action.clone() { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(username_action); if let Some(username_action) = username_action.clone() {
} cx.dispatch_action(username_action);
}); }
});
Flex::row() Flex::row()
.with_child(if let Some(username_tooltip) = username_tooltip { .with_child(if let Some(username_tooltip) = username_tooltip {
username username
.with_tooltip::<UsernameTooltip, _>( .with_tooltip::<UsernameTooltip>(
index, index,
username_tooltip, username_tooltip,
None, None,
@ -151,11 +152,11 @@ fn render_collaborator_list_entry<UA: Action + Clone, IA: Action + Clone>(
username.boxed() username.boxed()
}) })
.with_child( .with_child(
MouseEventHandler::<Icon>::new(index, cx, |_, _| icon.boxed()) MouseEventHandler::<Icon, CollaboratorListPopover>::new(index, cx, |_, _| icon.boxed())
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(icon_action.clone()) cx.dispatch_action(icon_action.clone())
}) })
.with_tooltip::<IconTooltip, _>(index, icon_tooltip, None, tooltip_theme, cx) .with_tooltip::<IconTooltip>(index, icon_tooltip, None, tooltip_theme, cx)
.boxed(), .boxed(),
) )
.boxed() .boxed()

4
crates/collab_ui/src/contact_finder.rs
View File

@ -32,7 +32,7 @@ impl View for ContactFinder {
"ContactFinder" "ContactFinder"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
ChildView::new(&self.picker, cx).boxed() ChildView::new(&self.picker, cx).boxed()
} }
@ -104,7 +104,7 @@ impl PickerDelegate for ContactFinder {
mouse_state: &mut MouseState, mouse_state: &mut MouseState,
selected: bool, selected: bool,
cx: &gpui::AppContext, cx: &gpui::AppContext,
) -> ElementBox { ) -> ElementBox<Picker<Self>> {
let theme = &cx.global::<Settings>().theme; let theme = &cx.global::<Settings>().theme;
let user = &self.potential_contacts[ix]; let user = &self.potential_contacts[ix];
let request_status = self.user_store.read(cx).contact_request_status(user); let request_status = self.user_store.read(cx).contact_request_status(user);

66
crates/collab_ui/src/contact_list.rs
View File

@ -159,7 +159,7 @@ pub enum Event {
pub struct ContactList { pub struct ContactList {
entries: Vec<ContactEntry>, entries: Vec<ContactEntry>,
match_candidates: Vec<StringMatchCandidate>, match_candidates: Vec<StringMatchCandidate>,
list_state: ListState, list_state: ListState<Self>,
project: ModelHandle<Project>, project: ModelHandle<Project>,
user_store: ModelHandle<UserStore>, user_store: ModelHandle<UserStore>,
filter_editor: ViewHandle<Editor>, filter_editor: ViewHandle<Editor>,
@ -202,7 +202,7 @@ impl ContactList {
}) })
.detach(); .detach();
let list_state = ListState::new(0, Orientation::Top, 1000., move |this, ix, cx| { let list_state = ListState::<Self>::new(0, Orientation::Top, 1000., move |this, ix, cx| {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
let is_selected = this.selection == Some(ix); let is_selected = this.selection == Some(ix);
let current_project_id = this.project.read(cx).remote_id(); let current_project_id = this.project.read(cx).remote_id();
@ -748,7 +748,7 @@ impl ContactList {
is_pending: bool, is_pending: bool,
is_selected: bool, is_selected: bool,
theme: &theme::ContactList, theme: &theme::ContactList,
) -> ElementBox { ) -> ElementBox<Self> {
Flex::row() Flex::row()
.with_children(user.avatar.clone().map(|avatar| { .with_children(user.avatar.clone().map(|avatar| {
Image::from_data(avatar) Image::from_data(avatar)
@ -800,7 +800,7 @@ impl ContactList {
is_selected: bool, is_selected: bool,
theme: &theme::ContactList, theme: &theme::ContactList,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let font_cache = cx.font_cache(); let font_cache = cx.font_cache();
let host_avatar_height = theme let host_avatar_height = theme
.contact_avatar .contact_avatar
@ -819,7 +819,7 @@ impl ContactList {
worktree_root_names.join(", ") worktree_root_names.join(", ")
}; };
MouseEventHandler::<JoinProject>::new(project_id as usize, cx, |mouse_state, _| { MouseEventHandler::<JoinProject, Self>::new(project_id as usize, cx, |mouse_state, _| {
let tree_branch = *tree_branch.style_for(mouse_state, is_selected); let tree_branch = *tree_branch.style_for(mouse_state, is_selected);
let row = theme.project_row.style_for(mouse_state, is_selected); let row = theme.project_row.style_for(mouse_state, is_selected);
@ -827,7 +827,7 @@ impl ContactList {
.with_child( .with_child(
Stack::new() Stack::new()
.with_child( .with_child(
Canvas::new(move |bounds, _, cx| { Canvas::new(move |scene, bounds, _, _, cx| {
let start_x = bounds.min_x() + (bounds.width() / 2.) let start_x = bounds.min_x() + (bounds.width() / 2.)
- (tree_branch.width / 2.); - (tree_branch.width / 2.);
let end_x = bounds.max_x(); let end_x = bounds.max_x();
@ -882,7 +882,7 @@ impl ContactList {
} else { } else {
CursorStyle::Arrow CursorStyle::Arrow
}) })
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
if !is_current { if !is_current {
cx.dispatch_global_action(JoinProject { cx.dispatch_global_action(JoinProject {
project_id, project_id,
@ -899,7 +899,7 @@ impl ContactList {
is_selected: bool, is_selected: bool,
theme: &theme::ContactList, theme: &theme::ContactList,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let font_cache = cx.font_cache(); let font_cache = cx.font_cache();
let host_avatar_height = theme let host_avatar_height = theme
.contact_avatar .contact_avatar
@ -913,7 +913,7 @@ impl ContactList {
let baseline_offset = let baseline_offset =
row.name.text.baseline_offset(font_cache) + (theme.row_height - line_height) / 2.; row.name.text.baseline_offset(font_cache) + (theme.row_height - line_height) / 2.;
MouseEventHandler::<OpenSharedScreen>::new( MouseEventHandler::<OpenSharedScreen, Self>::new(
peer_id.as_u64() as usize, peer_id.as_u64() as usize,
cx, cx,
|mouse_state, _| { |mouse_state, _| {
@ -924,7 +924,7 @@ impl ContactList {
.with_child( .with_child(
Stack::new() Stack::new()
.with_child( .with_child(
Canvas::new(move |bounds, _, cx| { Canvas::new(move |scene, bounds, _, _, cx| {
let start_x = bounds.min_x() + (bounds.width() / 2.) let start_x = bounds.min_x() + (bounds.width() / 2.)
- (tree_branch.width / 2.); - (tree_branch.width / 2.);
let end_x = bounds.max_x(); let end_x = bounds.max_x();
@ -988,7 +988,7 @@ impl ContactList {
}, },
) )
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(OpenSharedScreen { peer_id }); cx.dispatch_action(OpenSharedScreen { peer_id });
}) })
.boxed() .boxed()
@ -1000,7 +1000,7 @@ impl ContactList {
is_selected: bool, is_selected: bool,
is_collapsed: bool, is_collapsed: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
enum Header {} enum Header {}
enum LeaveCallContactList {} enum LeaveCallContactList {}
@ -1015,14 +1015,14 @@ impl ContactList {
}; };
let leave_call = if section == Section::ActiveCall { let leave_call = if section == Section::ActiveCall {
Some( Some(
MouseEventHandler::<LeaveCallContactList>::new(0, cx, |state, _| { MouseEventHandler::<LeaveCallContactList, Self>::new(0, cx, |state, _| {
let style = theme.leave_call.style_for(state, false); let style = theme.leave_call.style_for(state, false);
Label::new("Leave Call", style.text.clone()) Label::new("Leave Call", style.text.clone())
.contained() .contained()
.with_style(style.container) .with_style(style.container)
.boxed() .boxed()
}) })
.on_click(MouseButton::Left, |_, cx| cx.dispatch_action(LeaveCall)) .on_click(MouseButton::Left, |_, _, cx| cx.dispatch_action(LeaveCall))
.aligned() .aligned()
.boxed(), .boxed(),
) )
@ -1031,7 +1031,7 @@ impl ContactList {
}; };
let icon_size = theme.section_icon_size; let icon_size = theme.section_icon_size;
MouseEventHandler::<Header>::new(section as usize, cx, |_, _| { MouseEventHandler::<Header, Self>::new(section as usize, cx, |_, _| {
Flex::row() Flex::row()
.with_child( .with_child(
Svg::new(if is_collapsed { Svg::new(if is_collapsed {
@ -1065,7 +1065,7 @@ impl ContactList {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleExpanded(section)) cx.dispatch_action(ToggleExpanded(section))
}) })
.boxed() .boxed()
@ -1078,14 +1078,14 @@ impl ContactList {
theme: &theme::ContactList, theme: &theme::ContactList,
is_selected: bool, is_selected: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
let online = contact.online; let online = contact.online;
let busy = contact.busy || calling; let busy = contact.busy || calling;
let user_id = contact.user.id; let user_id = contact.user.id;
let github_login = contact.user.github_login.clone(); let github_login = contact.user.github_login.clone();
let initial_project = project.clone(); let initial_project = project.clone();
let mut element = let mut element =
MouseEventHandler::<Contact>::new(contact.user.id as usize, cx, |_, cx| { MouseEventHandler::<Contact, Self>::new(contact.user.id as usize, cx, |_, cx| {
Flex::row() Flex::row()
.with_children(contact.user.avatar.clone().map(|avatar| { .with_children(contact.user.avatar.clone().map(|avatar| {
let status_badge = if contact.online { let status_badge = if contact.online {
@ -1128,7 +1128,7 @@ impl ContactList {
.boxed(), .boxed(),
) )
.with_child( .with_child(
MouseEventHandler::<Cancel>::new( MouseEventHandler::<Cancel, Self>::new(
contact.user.id as usize, contact.user.id as usize,
cx, cx,
|mouse_state, _| { |mouse_state, _| {
@ -1142,7 +1142,7 @@ impl ContactList {
) )
.with_padding(Padding::uniform(2.)) .with_padding(Padding::uniform(2.))
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(RemoveContact { cx.dispatch_action(RemoveContact {
user_id, user_id,
github_login: github_login.clone(), github_login: github_login.clone(),
@ -1172,7 +1172,7 @@ impl ContactList {
) )
.boxed() .boxed()
}) })
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
if online && !busy { if online && !busy {
cx.dispatch_action(Call { cx.dispatch_action(Call {
recipient_user_id: user_id, recipient_user_id: user_id,
@ -1195,7 +1195,7 @@ impl ContactList {
is_incoming: bool, is_incoming: bool,
is_selected: bool, is_selected: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox<Self> {
enum Decline {} enum Decline {}
enum Accept {} enum Accept {}
enum Cancel {} enum Cancel {}
@ -1228,7 +1228,7 @@ impl ContactList {
if is_incoming { if is_incoming {
row.add_children([ row.add_children([
MouseEventHandler::<Decline>::new(user.id as usize, cx, |mouse_state, _| { MouseEventHandler::<Decline, Self>::new(user.id as usize, cx, |mouse_state, _| {
let button_style = if is_contact_request_pending { let button_style = if is_contact_request_pending {
&theme.disabled_button &theme.disabled_button
} else { } else {
@ -1239,7 +1239,7 @@ impl ContactList {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(RespondToContactRequest { cx.dispatch_action(RespondToContactRequest {
user_id, user_id,
accept: false, accept: false,
@ -1248,7 +1248,7 @@ impl ContactList {
.contained() .contained()
.with_margin_right(button_spacing) .with_margin_right(button_spacing)
.boxed(), .boxed(),
MouseEventHandler::<Accept>::new(user.id as usize, cx, |mouse_state, _| { MouseEventHandler::<Accept, Self>::new(user.id as usize, cx, |mouse_state, _| {
let button_style = if is_contact_request_pending { let button_style = if is_contact_request_pending {
&theme.disabled_button &theme.disabled_button
} else { } else {
@ -1260,7 +1260,7 @@ impl ContactList {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(RespondToContactRequest { cx.dispatch_action(RespondToContactRequest {
user_id, user_id,
accept: true, accept: true,
@ -1270,7 +1270,7 @@ impl ContactList {
]); ]);
} else { } else {
row.add_child( row.add_child(
MouseEventHandler::<Cancel>::new(user.id as usize, cx, |mouse_state, _| { MouseEventHandler::<Cancel, Self>::new(user.id as usize, cx, |mouse_state, _| {
let button_style = if is_contact_request_pending { let button_style = if is_contact_request_pending {
&theme.disabled_button &theme.disabled_button
} else { } else {
@ -1283,7 +1283,7 @@ impl ContactList {
}) })
.with_padding(Padding::uniform(2.)) .with_padding(Padding::uniform(2.))
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(RemoveContact { cx.dispatch_action(RemoveContact {
user_id, user_id,
github_login: github_login.clone(), github_login: github_login.clone(),
@ -1331,7 +1331,7 @@ impl View for ContactList {
cx cx
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
enum AddContact {} enum AddContact {}
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
@ -1346,7 +1346,7 @@ impl View for ContactList {
.boxed(), .boxed(),
) )
.with_child( .with_child(
MouseEventHandler::<AddContact>::new(0, cx, |_, _| { MouseEventHandler::<AddContact, Self>::new(0, cx, |_, _| {
render_icon_button( render_icon_button(
&theme.contact_list.add_contact_button, &theme.contact_list.add_contact_button,
"icons/user_plus_16.svg", "icons/user_plus_16.svg",
@ -1354,10 +1354,10 @@ impl View for ContactList {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(contacts_popover::ToggleContactFinder) cx.dispatch_action(contacts_popover::ToggleContactFinder)
}) })
.with_tooltip::<AddContact, _>( .with_tooltip::<AddContact>(
0, 0,
"Search for new contact".into(), "Search for new contact".into(),
None, None,
@ -1387,7 +1387,7 @@ impl View for ContactList {
} }
} }
fn render_icon_button(style: &IconButton, svg_path: &'static str) -> impl Element { fn render_icon_button(style: &IconButton, svg_path: &'static str) -> impl Element<ContactList> {
Svg::new(svg_path) Svg::new(svg_path)
.with_color(style.color) .with_color(style.color)
.constrained() .constrained()

2
crates/collab_ui/src/contact_notification.rs
View File

@ -42,7 +42,7 @@ impl View for ContactNotification {
"ContactNotification" "ContactNotification"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
match self.kind { match self.kind {
ContactEventKind::Requested => render_user_notification( ContactEventKind::Requested => render_user_notification(
self.user.clone(), self.user.clone(),

6
crates/collab_ui/src/contacts_popover.rs
View File

@ -91,14 +91,14 @@ impl View for ContactsPopover {
"ContactsPopover" "ContactsPopover"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
let child = match &self.child { let child = match &self.child {
Child::ContactList(child) => ChildView::new(child, cx), Child::ContactList(child) => ChildView::new(child, cx),
Child::ContactFinder(child) => ChildView::new(child, cx), Child::ContactFinder(child) => ChildView::new(child, cx),
}; };
MouseEventHandler::<ContactsPopover>::new(0, cx, |_, _| { MouseEventHandler::<ContactsPopover, Self>::new(0, cx, |_, _| {
Flex::column() Flex::column()
.with_child(child.flex(1., true).boxed()) .with_child(child.flex(1., true).boxed())
.contained() .contained()
@ -108,7 +108,7 @@ impl View for ContactsPopover {
.with_height(theme.contacts_popover.height) .with_height(theme.contacts_popover.height)
.boxed() .boxed()
}) })
.on_down_out(MouseButton::Left, move |_, cx| { .on_down_out(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(ToggleContactsMenu); cx.dispatch_action(ToggleContactsMenu);
}) })
.boxed() .boxed()

27
crates/collab_ui/src/face_pile.rs
View File

@ -7,13 +7,14 @@ use gpui::{
}, },
json::ToJson, json::ToJson,
serde_json::{self, json}, serde_json::{self, json},
Axis, DebugContext, Element, ElementBox, MeasurementContext, PaintContext, SceneBuilder, Axis, Element, ElementBox, SceneBuilder, ViewContext,
ViewContext,
}; };
use crate::CollabTitlebarItem;
pub(crate) struct FacePile { pub(crate) struct FacePile {
overlap: f32, overlap: f32,
faces: Vec<ElementBox>, faces: Vec<ElementBox<CollabTitlebarItem>>,
} }
impl FacePile { impl FacePile {
@ -25,15 +26,15 @@ impl FacePile {
} }
} }
impl<V: View> Element<V> for FacePile { impl Element<CollabTitlebarItem> for FacePile {
type LayoutState = (); type LayoutState = ();
type PaintState = (); type PaintState = ();
fn layout( fn layout(
&mut self, &mut self,
constraint: gpui::SizeConstraint, constraint: gpui::SizeConstraint,
view: &mut Self, view: &mut CollabTitlebarItem,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<CollabTitlebarItem>,
) -> (Vector2F, Self::LayoutState) { ) -> (Vector2F, Self::LayoutState) {
debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY); debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY);
@ -52,8 +53,8 @@ impl<V: View> Element<V> for FacePile {
bounds: RectF, bounds: RectF,
visible_bounds: RectF, visible_bounds: RectF,
_layout: &mut Self::LayoutState, _layout: &mut Self::LayoutState,
view: &mut Self, view: &mut CollabTitlebarItem,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<CollabTitlebarItem>,
) -> Self::PaintState { ) -> Self::PaintState {
let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default(); let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
@ -79,7 +80,8 @@ impl<V: View> Element<V> for FacePile {
_: RectF, _: RectF,
_: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
_: &MeasurementContext, _: &CollabTitlebarItem,
_: &ViewContext<CollabTitlebarItem>,
) -> Option<RectF> { ) -> Option<RectF> {
None None
} }
@ -89,7 +91,8 @@ impl<V: View> Element<V> for FacePile {
bounds: RectF, bounds: RectF,
_: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
_: &DebugContext, _: &CollabTitlebarItem,
_: &ViewContext<CollabTitlebarItem>,
) -> serde_json::Value { ) -> serde_json::Value {
json!({ json!({
"type": "FacePile", "type": "FacePile",
@ -98,8 +101,8 @@ impl<V: View> Element<V> for FacePile {
} }
} }
impl Extend<ElementBox<Self>> for FacePile { impl Extend<ElementBox<CollabTitlebarItem>> for FacePile {
fn extend<T: IntoIterator<Item = ElementBox<Self>>>(&mut self, children: T) { fn extend<T: IntoIterator<Item = ElementBox<CollabTitlebarItem>>>(&mut self, children: T) {
self.faces.extend(children); self.faces.extend(children);
} }
} }

16
crates/collab_ui/src/incoming_call_notification.rs
View File

@ -6,7 +6,7 @@ use gpui::{
geometry::{rect::RectF, vector::vec2f}, geometry::{rect::RectF, vector::vec2f},
impl_internal_actions, impl_internal_actions,
platform::{CursorStyle, MouseButton, WindowBounds, WindowKind, WindowOptions}, platform::{CursorStyle, MouseButton, WindowBounds, WindowKind, WindowOptions},
AppContext, Entity, View, ViewContext, AppContext, ElementBox, Entity, View, ViewContext,
}; };
use settings::Settings; use settings::Settings;
use util::ResultExt; use util::ResultExt;
@ -99,7 +99,7 @@ impl IncomingCallNotification {
} }
} }
fn render_caller(&self, cx: &mut ViewContext<Self>) -> ElementBox { fn render_caller(&self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let theme = &cx.global::<Settings>().theme.incoming_call_notification; let theme = &cx.global::<Settings>().theme.incoming_call_notification;
let default_project = proto::ParticipantProject::default(); let default_project = proto::ParticipantProject::default();
let initial_project = self let initial_project = self
@ -165,13 +165,13 @@ impl IncomingCallNotification {
.boxed() .boxed()
} }
fn render_buttons(&self, cx: &mut ViewContext<Self>) -> ElementBox { fn render_buttons(&self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
enum Accept {} enum Accept {}
enum Decline {} enum Decline {}
Flex::column() Flex::column()
.with_child( .with_child(
MouseEventHandler::<Accept>::new(0, cx, |_, cx| { MouseEventHandler::<Accept, Self>::new(0, cx, |_, cx| {
let theme = &cx.global::<Settings>().theme.incoming_call_notification; let theme = &cx.global::<Settings>().theme.incoming_call_notification;
Label::new("Accept", theme.accept_button.text.clone()) Label::new("Accept", theme.accept_button.text.clone())
.aligned() .aligned()
@ -180,14 +180,14 @@ impl IncomingCallNotification {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(RespondToCall { accept: true }); cx.dispatch_action(RespondToCall { accept: true });
}) })
.flex(1., true) .flex(1., true)
.boxed(), .boxed(),
) )
.with_child( .with_child(
MouseEventHandler::<Decline>::new(0, cx, |_, cx| { MouseEventHandler::<Decline, Self>::new(0, cx, |_, cx| {
let theme = &cx.global::<Settings>().theme.incoming_call_notification; let theme = &cx.global::<Settings>().theme.incoming_call_notification;
Label::new("Decline", theme.decline_button.text.clone()) Label::new("Decline", theme.decline_button.text.clone())
.aligned() .aligned()
@ -196,7 +196,7 @@ impl IncomingCallNotification {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(RespondToCall { accept: false }); cx.dispatch_action(RespondToCall { accept: false });
}) })
.flex(1., true) .flex(1., true)
@ -222,7 +222,7 @@ impl View for IncomingCallNotification {
"IncomingCallNotification" "IncomingCallNotification"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let background = cx let background = cx
.global::<Settings>() .global::<Settings>()
.theme .theme

10
crates/collab_ui/src/notifications.rs
View File

@ -17,7 +17,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
dismiss_action: A, dismiss_action: A,
buttons: Vec<(&'static str, Box<dyn Action>)>, buttons: Vec<(&'static str, Box<dyn Action>)>,
cx: &mut ViewContext<V>, cx: &mut ViewContext<V>,
) -> ElementBox { ) -> ElementBox<V> {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
let theme = &theme.contact_notification; let theme = &theme.contact_notification;
@ -51,7 +51,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
.boxed(), .boxed(),
) )
.with_child( .with_child(
MouseEventHandler::<Dismiss>::new(user.id as usize, cx, |state, _| { MouseEventHandler::<Dismiss, V>::new(user.id as usize, cx, |state, _| {
let style = theme.dismiss_button.style_for(state, false); let style = theme.dismiss_button.style_for(state, false);
Svg::new("icons/x_mark_8.svg") Svg::new("icons/x_mark_8.svg")
.with_color(style.color) .with_color(style.color)
@ -67,7 +67,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.with_padding(Padding::uniform(5.)) .with_padding(Padding::uniform(5.))
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_any_action(dismiss_action.boxed_clone()) cx.dispatch_any_action(dismiss_action.boxed_clone())
}) })
.aligned() .aligned()
@ -96,7 +96,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
Flex::row() Flex::row()
.with_children(buttons.into_iter().enumerate().map( .with_children(buttons.into_iter().enumerate().map(
|(ix, (message, action))| { |(ix, (message, action))| {
MouseEventHandler::<Button>::new(ix, cx, |state, _| { MouseEventHandler::<Button, V>::new(ix, cx, |state, _| {
let button = theme.button.style_for(state, false); let button = theme.button.style_for(state, false);
Label::new(message, button.text.clone()) Label::new(message, button.text.clone())
.contained() .contained()
@ -104,7 +104,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_any_action(action.boxed_clone()) cx.dispatch_any_action(action.boxed_clone())
}) })
.boxed() .boxed()

14
crates/collab_ui/src/project_shared_notification.rs
View File

@ -104,7 +104,7 @@ impl ProjectSharedNotification {
cx.remove_window(window_id); cx.remove_window(window_id);
} }
fn render_owner(&self, cx: &mut ViewContext<Self>) -> ElementBox { fn render_owner(&self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let theme = &cx.global::<Settings>().theme.project_shared_notification; let theme = &cx.global::<Settings>().theme.project_shared_notification;
Flex::row() Flex::row()
.with_children(self.owner.avatar.clone().map(|avatar| { .with_children(self.owner.avatar.clone().map(|avatar| {
@ -164,7 +164,7 @@ impl ProjectSharedNotification {
.boxed() .boxed()
} }
fn render_buttons(&self, cx: &mut ViewContext<Self>) -> ElementBox { fn render_buttons(&self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
enum Open {} enum Open {}
enum Dismiss {} enum Dismiss {}
@ -173,7 +173,7 @@ impl ProjectSharedNotification {
Flex::column() Flex::column()
.with_child( .with_child(
MouseEventHandler::<Open>::new(0, cx, |_, cx| { MouseEventHandler::<Open, Self>::new(0, cx, |_, cx| {
let theme = &cx.global::<Settings>().theme.project_shared_notification; let theme = &cx.global::<Settings>().theme.project_shared_notification;
Label::new("Open", theme.open_button.text.clone()) Label::new("Open", theme.open_button.text.clone())
.aligned() .aligned()
@ -182,7 +182,7 @@ impl ProjectSharedNotification {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| { .on_click(MouseButton::Left, move |_, _, cx| {
cx.dispatch_action(JoinProject { cx.dispatch_action(JoinProject {
project_id, project_id,
follow_user_id: owner_user_id, follow_user_id: owner_user_id,
@ -192,7 +192,7 @@ impl ProjectSharedNotification {
.boxed(), .boxed(),
) )
.with_child( .with_child(
MouseEventHandler::<Dismiss>::new(0, cx, |_, cx| { MouseEventHandler::<Dismiss, Self>::new(0, cx, |_, cx| {
let theme = &cx.global::<Settings>().theme.project_shared_notification; let theme = &cx.global::<Settings>().theme.project_shared_notification;
Label::new("Dismiss", theme.dismiss_button.text.clone()) Label::new("Dismiss", theme.dismiss_button.text.clone())
.aligned() .aligned()
@ -201,7 +201,7 @@ impl ProjectSharedNotification {
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(DismissProject); cx.dispatch_action(DismissProject);
}) })
.flex(1., true) .flex(1., true)
@ -227,7 +227,7 @@ impl View for ProjectSharedNotification {
"ProjectSharedNotification" "ProjectSharedNotification"
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::ElementBox<Self> {
let background = cx let background = cx
.global::<Settings>() .global::<Settings>()
.theme .theme

8
crates/collab_ui/src/sharing_status_indicator.rs
View File

@ -40,13 +40,13 @@ impl View for SharingStatusIndicator {
"SharingStatusIndicator" "SharingStatusIndicator"
} }
fn render(&mut self, cx: &mut ViewContext<'_, Self>) -> ElementBox { fn render(&mut self, cx: &mut ViewContext<Self>) -> ElementBox<Self> {
let color = match cx.appearance { let color = match cx.window_appearance() {
Appearance::Light | Appearance::VibrantLight => Color::black(), Appearance::Light | Appearance::VibrantLight => Color::black(),
Appearance::Dark | Appearance::VibrantDark => Color::white(), Appearance::Dark | Appearance::VibrantDark => Color::white(),
}; };
MouseEventHandler::<Self>::new(0, cx, |_, _| { MouseEventHandler::<Self, Self>::new(0, cx, |_, _| {
Svg::new("icons/disable_screen_sharing_12.svg") Svg::new("icons/disable_screen_sharing_12.svg")
.with_color(color) .with_color(color)
.constrained() .constrained()
@ -54,7 +54,7 @@ impl View for SharingStatusIndicator {
.aligned() .aligned()
.boxed() .boxed()
}) })
.on_click(MouseButton::Left, |_, cx| { .on_click(MouseButton::Left, |_, _, cx| {
cx.dispatch_action(ToggleScreenSharing); cx.dispatch_action(ToggleScreenSharing);
}) })
.boxed() .boxed()

4
crates/gpui/src/app/window.rs
View File

@ -805,6 +805,10 @@ impl<'a: 'b, 'b> WindowContext<'a, 'b> {
self.window.platform_window.bounds() self.window.platform_window.bounds()
} }
pub fn window_appearance(&self) -> Appearance {
self.window.appearance
}
pub fn window_display_uuid(&self) -> Option<Uuid> { pub fn window_display_uuid(&self) -> Option<Uuid> {
self.window.platform_window.screen().display_uuid() self.window.platform_window.screen().display_uuid()
} }