2023-07-25 03:00:31 +00:00
|
|
|
mod contact_finder;
|
2023-07-24 21:39:16 +00:00
|
|
|
mod panel_settings;
|
|
|
|
|
2023-07-19 01:55:54 +00:00
|
|
|
use anyhow::Result;
|
2023-07-25 03:00:31 +00:00
|
|
|
use call::ActiveCall;
|
|
|
|
use client::{proto::PeerId, Client, Contact, User, UserStore};
|
|
|
|
use contact_finder::{build_contact_finder, ContactFinder};
|
2023-07-19 01:55:54 +00:00
|
|
|
use context_menu::ContextMenu;
|
|
|
|
use db::kvp::KEY_VALUE_STORE;
|
2023-07-25 03:00:31 +00:00
|
|
|
use editor::{Cancel, Editor};
|
|
|
|
use futures::StreamExt;
|
|
|
|
use fuzzy::{match_strings, StringMatchCandidate};
|
2023-07-19 01:55:54 +00:00
|
|
|
use gpui::{
|
|
|
|
actions,
|
2023-07-25 03:00:31 +00:00
|
|
|
elements::{
|
|
|
|
Canvas, ChildView, Empty, Flex, Image, Label, List, ListOffset, ListState,
|
|
|
|
MouseEventHandler, Orientation, Padding, ParentElement, Stack, Svg,
|
|
|
|
},
|
|
|
|
geometry::{rect::RectF, vector::vec2f},
|
|
|
|
platform::{CursorStyle, MouseButton, PromptLevel},
|
|
|
|
serde_json, AnyElement, AppContext, AsyncAppContext, Element, Entity, ModelHandle,
|
|
|
|
Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle,
|
2023-07-19 01:55:54 +00:00
|
|
|
};
|
2023-07-25 03:00:31 +00:00
|
|
|
use menu::{Confirm, SelectNext, SelectPrev};
|
|
|
|
use panel_settings::{ChannelsPanelDockPosition, ChannelsPanelSettings};
|
|
|
|
use project::{Fs, Project};
|
2023-07-19 01:55:54 +00:00
|
|
|
use serde_derive::{Deserialize, Serialize};
|
|
|
|
use settings::SettingsStore;
|
2023-07-25 03:00:31 +00:00
|
|
|
use std::{mem, sync::Arc};
|
|
|
|
use theme::IconButton;
|
2023-07-19 01:55:54 +00:00
|
|
|
use util::{ResultExt, TryFutureExt};
|
|
|
|
use workspace::{
|
|
|
|
dock::{DockPosition, Panel},
|
|
|
|
Workspace,
|
|
|
|
};
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
actions!(collab_panel, [ToggleFocus]);
|
2023-07-19 01:55:54 +00:00
|
|
|
|
|
|
|
const CHANNELS_PANEL_KEY: &'static str = "ChannelsPanel";
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
pub fn init(_client: Arc<Client>, cx: &mut AppContext) {
|
|
|
|
settings::register::<panel_settings::ChannelsPanelSettings>(cx);
|
2023-07-25 03:00:31 +00:00
|
|
|
contact_finder::init(cx);
|
|
|
|
|
|
|
|
cx.add_action(CollabPanel::cancel);
|
|
|
|
cx.add_action(CollabPanel::select_next);
|
|
|
|
cx.add_action(CollabPanel::select_prev);
|
|
|
|
cx.add_action(CollabPanel::confirm);
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
pub struct CollabPanel {
|
2023-07-19 01:55:54 +00:00
|
|
|
width: Option<f32>,
|
|
|
|
fs: Arc<dyn Fs>,
|
|
|
|
has_focus: bool,
|
|
|
|
pending_serialization: Task<Option<()>>,
|
|
|
|
context_menu: ViewHandle<ContextMenu>,
|
2023-07-25 03:00:31 +00:00
|
|
|
contact_finder: Option<ViewHandle<ContactFinder>>,
|
|
|
|
|
|
|
|
// from contacts list
|
|
|
|
filter_editor: ViewHandle<Editor>,
|
|
|
|
entries: Vec<ContactEntry>,
|
|
|
|
selection: Option<usize>,
|
|
|
|
user_store: ModelHandle<UserStore>,
|
|
|
|
project: ModelHandle<Project>,
|
|
|
|
match_candidates: Vec<StringMatchCandidate>,
|
|
|
|
list_state: ListState<Self>,
|
|
|
|
subscriptions: Vec<Subscription>,
|
|
|
|
collapsed_sections: Vec<Section>,
|
|
|
|
workspace: WeakViewHandle<Workspace>,
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
|
|
struct SerializedChannelsPanel {
|
|
|
|
width: Option<f32>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub enum Event {
|
|
|
|
DockPositionChanged,
|
|
|
|
Focus,
|
2023-07-25 03:00:31 +00:00
|
|
|
Dismissed,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone, Copy, PartialEq, Eq, Debug, PartialOrd, Ord)]
|
|
|
|
enum Section {
|
|
|
|
ActiveCall,
|
|
|
|
Requests,
|
|
|
|
Online,
|
|
|
|
Offline,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
enum ContactEntry {
|
|
|
|
Header(Section),
|
|
|
|
CallParticipant {
|
|
|
|
user: Arc<User>,
|
|
|
|
is_pending: bool,
|
|
|
|
},
|
|
|
|
ParticipantProject {
|
|
|
|
project_id: u64,
|
|
|
|
worktree_root_names: Vec<String>,
|
|
|
|
host_user_id: u64,
|
|
|
|
is_last: bool,
|
|
|
|
},
|
|
|
|
ParticipantScreen {
|
|
|
|
peer_id: PeerId,
|
|
|
|
is_last: bool,
|
|
|
|
},
|
|
|
|
IncomingRequest(Arc<User>),
|
|
|
|
OutgoingRequest(Arc<User>),
|
|
|
|
Contact {
|
|
|
|
contact: Arc<Contact>,
|
|
|
|
calling: bool,
|
|
|
|
},
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
impl Entity for CollabPanel {
|
2023-07-19 01:55:54 +00:00
|
|
|
type Event = Event;
|
|
|
|
}
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
impl CollabPanel {
|
2023-07-19 01:55:54 +00:00
|
|
|
pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> ViewHandle<Self> {
|
2023-07-25 03:00:31 +00:00
|
|
|
cx.add_view::<Self, _>(|cx| {
|
2023-07-19 01:55:54 +00:00
|
|
|
let view_id = cx.view_id();
|
2023-07-24 21:39:16 +00:00
|
|
|
|
2023-07-25 03:00:31 +00:00
|
|
|
let filter_editor = cx.add_view(|cx| {
|
|
|
|
let mut editor = Editor::single_line(
|
|
|
|
Some(Arc::new(|theme| {
|
2023-07-25 17:02:01 +00:00
|
|
|
theme.collab_panel.user_query_editor.clone()
|
2023-07-25 03:00:31 +00:00
|
|
|
})),
|
|
|
|
cx,
|
|
|
|
);
|
|
|
|
editor.set_placeholder_text("Filter contacts", cx);
|
|
|
|
editor
|
|
|
|
});
|
|
|
|
|
|
|
|
cx.subscribe(&filter_editor, |this, _, event, cx| {
|
|
|
|
if let editor::Event::BufferEdited = event {
|
|
|
|
let query = this.filter_editor.read(cx).text(cx);
|
|
|
|
if !query.is_empty() {
|
|
|
|
this.selection.take();
|
|
|
|
}
|
|
|
|
this.update_entries(cx);
|
|
|
|
if !query.is_empty() {
|
|
|
|
this.selection = this
|
|
|
|
.entries
|
|
|
|
.iter()
|
|
|
|
.position(|entry| !matches!(entry, ContactEntry::Header(_)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.detach();
|
|
|
|
|
|
|
|
let list_state =
|
|
|
|
ListState::<Self>::new(0, Orientation::Top, 1000., move |this, ix, cx| {
|
|
|
|
let theme = theme::current(cx).clone();
|
|
|
|
let is_selected = this.selection == Some(ix);
|
|
|
|
let current_project_id = this.project.read(cx).remote_id();
|
|
|
|
|
|
|
|
match &this.entries[ix] {
|
|
|
|
ContactEntry::Header(section) => {
|
|
|
|
let is_collapsed = this.collapsed_sections.contains(section);
|
|
|
|
Self::render_header(
|
|
|
|
*section,
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
is_selected,
|
|
|
|
is_collapsed,
|
|
|
|
cx,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
ContactEntry::CallParticipant { user, is_pending } => {
|
|
|
|
Self::render_call_participant(
|
|
|
|
user,
|
|
|
|
*is_pending,
|
|
|
|
is_selected,
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
ContactEntry::ParticipantProject {
|
|
|
|
project_id,
|
|
|
|
worktree_root_names,
|
|
|
|
host_user_id,
|
|
|
|
is_last,
|
|
|
|
} => Self::render_participant_project(
|
|
|
|
*project_id,
|
|
|
|
worktree_root_names,
|
|
|
|
*host_user_id,
|
|
|
|
Some(*project_id) == current_project_id,
|
|
|
|
*is_last,
|
|
|
|
is_selected,
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
cx,
|
|
|
|
),
|
|
|
|
ContactEntry::ParticipantScreen { peer_id, is_last } => {
|
|
|
|
Self::render_participant_screen(
|
|
|
|
*peer_id,
|
|
|
|
*is_last,
|
|
|
|
is_selected,
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
cx,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
ContactEntry::IncomingRequest(user) => Self::render_contact_request(
|
|
|
|
user.clone(),
|
|
|
|
this.user_store.clone(),
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
true,
|
|
|
|
is_selected,
|
|
|
|
cx,
|
|
|
|
),
|
|
|
|
ContactEntry::OutgoingRequest(user) => Self::render_contact_request(
|
|
|
|
user.clone(),
|
|
|
|
this.user_store.clone(),
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
false,
|
|
|
|
is_selected,
|
|
|
|
cx,
|
|
|
|
),
|
|
|
|
ContactEntry::Contact { contact, calling } => Self::render_contact(
|
|
|
|
contact,
|
|
|
|
*calling,
|
|
|
|
&this.project,
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel,
|
2023-07-25 03:00:31 +00:00
|
|
|
is_selected,
|
|
|
|
cx,
|
|
|
|
),
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
let mut this = Self {
|
2023-07-19 01:55:54 +00:00
|
|
|
width: None,
|
|
|
|
has_focus: false,
|
|
|
|
fs: workspace.app_state().fs.clone(),
|
|
|
|
pending_serialization: Task::ready(None),
|
|
|
|
context_menu: cx.add_view(|cx| ContextMenu::new(view_id, cx)),
|
2023-07-25 03:00:31 +00:00
|
|
|
filter_editor,
|
|
|
|
contact_finder: None,
|
|
|
|
entries: Vec::default(),
|
|
|
|
selection: None,
|
|
|
|
user_store: workspace.user_store().clone(),
|
|
|
|
project: workspace.project().clone(),
|
|
|
|
subscriptions: Vec::default(),
|
|
|
|
match_candidates: Vec::default(),
|
|
|
|
collapsed_sections: Vec::default(),
|
|
|
|
workspace: workspace.weak_handle(),
|
|
|
|
list_state,
|
2023-07-19 01:55:54 +00:00
|
|
|
};
|
2023-07-25 03:00:31 +00:00
|
|
|
this.update_entries(cx);
|
2023-07-19 01:55:54 +00:00
|
|
|
|
|
|
|
// Update the dock position when the setting changes.
|
|
|
|
let mut old_dock_position = this.position(cx);
|
2023-07-25 03:00:31 +00:00
|
|
|
this.subscriptions
|
|
|
|
.push(
|
|
|
|
cx.observe_global::<SettingsStore, _>(move |this: &mut CollabPanel, cx| {
|
|
|
|
let new_dock_position = this.position(cx);
|
|
|
|
if new_dock_position != old_dock_position {
|
|
|
|
old_dock_position = new_dock_position;
|
|
|
|
cx.emit(Event::DockPositionChanged);
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
|
|
|
|
let active_call = ActiveCall::global(cx);
|
|
|
|
this.subscriptions
|
|
|
|
.push(cx.observe(&this.user_store, |this, _, cx| this.update_entries(cx)));
|
|
|
|
this.subscriptions
|
|
|
|
.push(cx.observe(&active_call, |this, _, cx| this.update_entries(cx)));
|
2023-07-19 01:55:54 +00:00
|
|
|
|
|
|
|
this
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn load(
|
|
|
|
workspace: WeakViewHandle<Workspace>,
|
|
|
|
cx: AsyncAppContext,
|
|
|
|
) -> Task<Result<ViewHandle<Self>>> {
|
|
|
|
cx.spawn(|mut cx| async move {
|
|
|
|
let serialized_panel = if let Some(panel) = cx
|
|
|
|
.background()
|
|
|
|
.spawn(async move { KEY_VALUE_STORE.read_kvp(CHANNELS_PANEL_KEY) })
|
|
|
|
.await
|
|
|
|
.log_err()
|
|
|
|
.flatten()
|
|
|
|
{
|
|
|
|
Some(serde_json::from_str::<SerializedChannelsPanel>(&panel)?)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
workspace.update(&mut cx, |workspace, cx| {
|
2023-07-24 21:39:16 +00:00
|
|
|
let panel = CollabPanel::new(workspace, cx);
|
2023-07-19 01:55:54 +00:00
|
|
|
if let Some(serialized_panel) = serialized_panel {
|
|
|
|
panel.update(cx, |panel, cx| {
|
|
|
|
panel.width = serialized_panel.width;
|
|
|
|
cx.notify();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
panel
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fn serialize(&mut self, cx: &mut ViewContext<Self>) {
|
|
|
|
let width = self.width;
|
|
|
|
self.pending_serialization = cx.background().spawn(
|
|
|
|
async move {
|
|
|
|
KEY_VALUE_STORE
|
|
|
|
.write_kvp(
|
|
|
|
CHANNELS_PANEL_KEY.into(),
|
2023-07-24 21:39:16 +00:00
|
|
|
serde_json::to_string(&SerializedChannelsPanel { width })?,
|
2023-07-19 01:55:54 +00:00
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
anyhow::Ok(())
|
|
|
|
}
|
|
|
|
.log_err(),
|
|
|
|
);
|
|
|
|
}
|
2023-07-25 03:00:31 +00:00
|
|
|
|
|
|
|
fn update_entries(&mut self, cx: &mut ViewContext<Self>) {
|
|
|
|
let user_store = self.user_store.read(cx);
|
|
|
|
let query = self.filter_editor.read(cx).text(cx);
|
|
|
|
let executor = cx.background().clone();
|
|
|
|
|
|
|
|
let prev_selected_entry = self.selection.and_then(|ix| self.entries.get(ix).cloned());
|
|
|
|
let old_entries = mem::take(&mut self.entries);
|
|
|
|
|
|
|
|
if let Some(room) = ActiveCall::global(cx).read(cx).room() {
|
|
|
|
let room = room.read(cx);
|
|
|
|
let mut participant_entries = Vec::new();
|
|
|
|
|
|
|
|
// Populate the active user.
|
|
|
|
if let Some(user) = user_store.current_user() {
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates.push(StringMatchCandidate {
|
|
|
|
id: 0,
|
|
|
|
string: user.github_login.clone(),
|
|
|
|
char_bag: user.github_login.chars().collect(),
|
|
|
|
});
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
if !matches.is_empty() {
|
|
|
|
let user_id = user.id;
|
|
|
|
participant_entries.push(ContactEntry::CallParticipant {
|
|
|
|
user,
|
|
|
|
is_pending: false,
|
|
|
|
});
|
|
|
|
let mut projects = room.local_participant().projects.iter().peekable();
|
|
|
|
while let Some(project) = projects.next() {
|
|
|
|
participant_entries.push(ContactEntry::ParticipantProject {
|
|
|
|
project_id: project.id,
|
|
|
|
worktree_root_names: project.worktree_root_names.clone(),
|
|
|
|
host_user_id: user_id,
|
|
|
|
is_last: projects.peek().is_none(),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Populate remote participants.
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates
|
|
|
|
.extend(room.remote_participants().iter().map(|(_, participant)| {
|
|
|
|
StringMatchCandidate {
|
|
|
|
id: participant.user.id as usize,
|
|
|
|
string: participant.user.github_login.clone(),
|
|
|
|
char_bag: participant.user.github_login.chars().collect(),
|
|
|
|
}
|
|
|
|
}));
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
for mat in matches {
|
|
|
|
let user_id = mat.candidate_id as u64;
|
|
|
|
let participant = &room.remote_participants()[&user_id];
|
|
|
|
participant_entries.push(ContactEntry::CallParticipant {
|
|
|
|
user: participant.user.clone(),
|
|
|
|
is_pending: false,
|
|
|
|
});
|
|
|
|
let mut projects = participant.projects.iter().peekable();
|
|
|
|
while let Some(project) = projects.next() {
|
|
|
|
participant_entries.push(ContactEntry::ParticipantProject {
|
|
|
|
project_id: project.id,
|
|
|
|
worktree_root_names: project.worktree_root_names.clone(),
|
|
|
|
host_user_id: participant.user.id,
|
|
|
|
is_last: projects.peek().is_none() && participant.video_tracks.is_empty(),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if !participant.video_tracks.is_empty() {
|
|
|
|
participant_entries.push(ContactEntry::ParticipantScreen {
|
|
|
|
peer_id: participant.peer_id,
|
|
|
|
is_last: true,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Populate pending participants.
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates
|
|
|
|
.extend(
|
|
|
|
room.pending_participants()
|
|
|
|
.iter()
|
|
|
|
.enumerate()
|
|
|
|
.map(|(id, participant)| StringMatchCandidate {
|
|
|
|
id,
|
|
|
|
string: participant.github_login.clone(),
|
|
|
|
char_bag: participant.github_login.chars().collect(),
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
participant_entries.extend(matches.iter().map(|mat| ContactEntry::CallParticipant {
|
|
|
|
user: room.pending_participants()[mat.candidate_id].clone(),
|
|
|
|
is_pending: true,
|
|
|
|
}));
|
|
|
|
|
|
|
|
if !participant_entries.is_empty() {
|
|
|
|
self.entries.push(ContactEntry::Header(Section::ActiveCall));
|
|
|
|
if !self.collapsed_sections.contains(&Section::ActiveCall) {
|
|
|
|
self.entries.extend(participant_entries);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut request_entries = Vec::new();
|
|
|
|
let incoming = user_store.incoming_contact_requests();
|
|
|
|
if !incoming.is_empty() {
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates
|
|
|
|
.extend(
|
|
|
|
incoming
|
|
|
|
.iter()
|
|
|
|
.enumerate()
|
|
|
|
.map(|(ix, user)| StringMatchCandidate {
|
|
|
|
id: ix,
|
|
|
|
string: user.github_login.clone(),
|
|
|
|
char_bag: user.github_login.chars().collect(),
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
request_entries.extend(
|
|
|
|
matches
|
|
|
|
.iter()
|
|
|
|
.map(|mat| ContactEntry::IncomingRequest(incoming[mat.candidate_id].clone())),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
let outgoing = user_store.outgoing_contact_requests();
|
|
|
|
if !outgoing.is_empty() {
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates
|
|
|
|
.extend(
|
|
|
|
outgoing
|
|
|
|
.iter()
|
|
|
|
.enumerate()
|
|
|
|
.map(|(ix, user)| StringMatchCandidate {
|
|
|
|
id: ix,
|
|
|
|
string: user.github_login.clone(),
|
|
|
|
char_bag: user.github_login.chars().collect(),
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
request_entries.extend(
|
|
|
|
matches
|
|
|
|
.iter()
|
|
|
|
.map(|mat| ContactEntry::OutgoingRequest(outgoing[mat.candidate_id].clone())),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
if !request_entries.is_empty() {
|
|
|
|
self.entries.push(ContactEntry::Header(Section::Requests));
|
|
|
|
if !self.collapsed_sections.contains(&Section::Requests) {
|
|
|
|
self.entries.append(&mut request_entries);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let contacts = user_store.contacts();
|
|
|
|
if !contacts.is_empty() {
|
|
|
|
self.match_candidates.clear();
|
|
|
|
self.match_candidates
|
|
|
|
.extend(
|
|
|
|
contacts
|
|
|
|
.iter()
|
|
|
|
.enumerate()
|
|
|
|
.map(|(ix, contact)| StringMatchCandidate {
|
|
|
|
id: ix,
|
|
|
|
string: contact.user.github_login.clone(),
|
|
|
|
char_bag: contact.user.github_login.chars().collect(),
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
|
|
|
|
let matches = executor.block(match_strings(
|
|
|
|
&self.match_candidates,
|
|
|
|
&query,
|
|
|
|
true,
|
|
|
|
usize::MAX,
|
|
|
|
&Default::default(),
|
|
|
|
executor.clone(),
|
|
|
|
));
|
|
|
|
|
|
|
|
let (mut online_contacts, offline_contacts) = matches
|
|
|
|
.iter()
|
|
|
|
.partition::<Vec<_>, _>(|mat| contacts[mat.candidate_id].online);
|
|
|
|
if let Some(room) = ActiveCall::global(cx).read(cx).room() {
|
|
|
|
let room = room.read(cx);
|
|
|
|
online_contacts.retain(|contact| {
|
|
|
|
let contact = &contacts[contact.candidate_id];
|
|
|
|
!room.contains_participant(contact.user.id)
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
for (matches, section) in [
|
|
|
|
(online_contacts, Section::Online),
|
|
|
|
(offline_contacts, Section::Offline),
|
|
|
|
] {
|
|
|
|
if !matches.is_empty() {
|
|
|
|
self.entries.push(ContactEntry::Header(section));
|
|
|
|
if !self.collapsed_sections.contains(§ion) {
|
|
|
|
let active_call = &ActiveCall::global(cx).read(cx);
|
|
|
|
for mat in matches {
|
|
|
|
let contact = &contacts[mat.candidate_id];
|
|
|
|
self.entries.push(ContactEntry::Contact {
|
|
|
|
contact: contact.clone(),
|
|
|
|
calling: active_call.pending_invites().contains(&contact.user.id),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(prev_selected_entry) = prev_selected_entry {
|
|
|
|
self.selection.take();
|
|
|
|
for (ix, entry) in self.entries.iter().enumerate() {
|
|
|
|
if *entry == prev_selected_entry {
|
|
|
|
self.selection = Some(ix);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let old_scroll_top = self.list_state.logical_scroll_top();
|
|
|
|
self.list_state.reset(self.entries.len());
|
|
|
|
|
|
|
|
// Attempt to maintain the same scroll position.
|
|
|
|
if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
|
|
|
|
let new_scroll_top = self
|
|
|
|
.entries
|
|
|
|
.iter()
|
|
|
|
.position(|entry| entry == old_top_entry)
|
|
|
|
.map(|item_ix| ListOffset {
|
|
|
|
item_ix,
|
|
|
|
offset_in_item: old_scroll_top.offset_in_item,
|
|
|
|
})
|
|
|
|
.or_else(|| {
|
|
|
|
let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
|
|
|
|
let item_ix = self
|
|
|
|
.entries
|
|
|
|
.iter()
|
|
|
|
.position(|entry| entry == entry_after_old_top)?;
|
|
|
|
Some(ListOffset {
|
|
|
|
item_ix,
|
|
|
|
offset_in_item: 0.,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.or_else(|| {
|
|
|
|
let entry_before_old_top =
|
|
|
|
old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
|
|
|
|
let item_ix = self
|
|
|
|
.entries
|
|
|
|
.iter()
|
|
|
|
.position(|entry| entry == entry_before_old_top)?;
|
|
|
|
Some(ListOffset {
|
|
|
|
item_ix,
|
|
|
|
offset_in_item: 0.,
|
|
|
|
})
|
|
|
|
});
|
|
|
|
|
|
|
|
self.list_state
|
|
|
|
.scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
|
|
|
|
}
|
|
|
|
|
|
|
|
cx.notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_call_participant(
|
|
|
|
user: &User,
|
|
|
|
is_pending: bool,
|
|
|
|
is_selected: bool,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
) -> AnyElement<Self> {
|
|
|
|
Flex::row()
|
|
|
|
.with_children(user.avatar.clone().map(|avatar| {
|
|
|
|
Image::from_data(avatar)
|
|
|
|
.with_style(theme.contact_avatar)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
}))
|
|
|
|
.with_child(
|
|
|
|
Label::new(
|
|
|
|
user.github_login.clone(),
|
|
|
|
theme.contact_username.text.clone(),
|
|
|
|
)
|
|
|
|
.contained()
|
|
|
|
.with_style(theme.contact_username.container)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.flex(1., true),
|
|
|
|
)
|
|
|
|
.with_children(if is_pending {
|
|
|
|
Some(
|
|
|
|
Label::new("Calling", theme.calling_indicator.text.clone())
|
|
|
|
.contained()
|
|
|
|
.with_style(theme.calling_indicator.container)
|
|
|
|
.aligned(),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
})
|
|
|
|
.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(
|
|
|
|
*theme
|
|
|
|
.contact_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(&mut Default::default()),
|
|
|
|
)
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_participant_project(
|
|
|
|
project_id: u64,
|
|
|
|
worktree_root_names: &[String],
|
|
|
|
host_user_id: u64,
|
|
|
|
is_current: bool,
|
|
|
|
is_last: bool,
|
|
|
|
is_selected: bool,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) -> AnyElement<Self> {
|
|
|
|
enum JoinProject {}
|
|
|
|
|
|
|
|
let font_cache = cx.font_cache();
|
|
|
|
let host_avatar_height = theme
|
|
|
|
.contact_avatar
|
|
|
|
.width
|
|
|
|
.or(theme.contact_avatar.height)
|
|
|
|
.unwrap_or(0.);
|
|
|
|
let row = &theme.project_row.inactive_state().default;
|
|
|
|
let tree_branch = theme.tree_branch;
|
|
|
|
let line_height = row.name.text.line_height(font_cache);
|
|
|
|
let cap_height = row.name.text.cap_height(font_cache);
|
|
|
|
let baseline_offset =
|
|
|
|
row.name.text.baseline_offset(font_cache) + (theme.row_height - line_height) / 2.;
|
|
|
|
let project_name = if worktree_root_names.is_empty() {
|
|
|
|
"untitled".to_string()
|
|
|
|
} else {
|
|
|
|
worktree_root_names.join(", ")
|
|
|
|
};
|
|
|
|
|
|
|
|
MouseEventHandler::<JoinProject, Self>::new(project_id as usize, cx, |mouse_state, _| {
|
|
|
|
let tree_branch = *tree_branch.in_state(is_selected).style_for(mouse_state);
|
|
|
|
let row = theme
|
|
|
|
.project_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(mouse_state);
|
|
|
|
|
|
|
|
Flex::row()
|
|
|
|
.with_child(
|
|
|
|
Stack::new()
|
|
|
|
.with_child(Canvas::new(move |scene, bounds, _, _, _| {
|
|
|
|
let start_x =
|
|
|
|
bounds.min_x() + (bounds.width() / 2.) - (tree_branch.width / 2.);
|
|
|
|
let end_x = bounds.max_x();
|
|
|
|
let start_y = bounds.min_y();
|
|
|
|
let end_y = bounds.min_y() + baseline_offset - (cap_height / 2.);
|
|
|
|
|
|
|
|
scene.push_quad(gpui::Quad {
|
|
|
|
bounds: RectF::from_points(
|
|
|
|
vec2f(start_x, start_y),
|
|
|
|
vec2f(
|
|
|
|
start_x + tree_branch.width,
|
|
|
|
if is_last { end_y } else { bounds.max_y() },
|
|
|
|
),
|
|
|
|
),
|
|
|
|
background: Some(tree_branch.color),
|
|
|
|
border: gpui::Border::default(),
|
|
|
|
corner_radius: 0.,
|
|
|
|
});
|
|
|
|
scene.push_quad(gpui::Quad {
|
|
|
|
bounds: RectF::from_points(
|
|
|
|
vec2f(start_x, end_y),
|
|
|
|
vec2f(end_x, end_y + tree_branch.width),
|
|
|
|
),
|
|
|
|
background: Some(tree_branch.color),
|
|
|
|
border: gpui::Border::default(),
|
|
|
|
corner_radius: 0.,
|
|
|
|
});
|
|
|
|
}))
|
|
|
|
.constrained()
|
|
|
|
.with_width(host_avatar_height),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
Label::new(project_name, row.name.text.clone())
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.contained()
|
|
|
|
.with_style(row.name.container)
|
|
|
|
.flex(1., false),
|
|
|
|
)
|
|
|
|
.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(row.container)
|
|
|
|
})
|
|
|
|
.with_cursor_style(if !is_current {
|
|
|
|
CursorStyle::PointingHand
|
|
|
|
} else {
|
|
|
|
CursorStyle::Arrow
|
|
|
|
})
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
if !is_current {
|
|
|
|
if let Some(workspace) = this.workspace.upgrade(cx) {
|
|
|
|
let app_state = workspace.read(cx).app_state().clone();
|
|
|
|
workspace::join_remote_project(project_id, host_user_id, app_state, cx)
|
|
|
|
.detach_and_log_err(cx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_participant_screen(
|
|
|
|
peer_id: PeerId,
|
|
|
|
is_last: bool,
|
|
|
|
is_selected: bool,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) -> AnyElement<Self> {
|
|
|
|
enum OpenSharedScreen {}
|
|
|
|
|
|
|
|
let font_cache = cx.font_cache();
|
|
|
|
let host_avatar_height = theme
|
|
|
|
.contact_avatar
|
|
|
|
.width
|
|
|
|
.or(theme.contact_avatar.height)
|
|
|
|
.unwrap_or(0.);
|
|
|
|
let row = &theme.project_row.inactive_state().default;
|
|
|
|
let tree_branch = theme.tree_branch;
|
|
|
|
let line_height = row.name.text.line_height(font_cache);
|
|
|
|
let cap_height = row.name.text.cap_height(font_cache);
|
|
|
|
let baseline_offset =
|
|
|
|
row.name.text.baseline_offset(font_cache) + (theme.row_height - line_height) / 2.;
|
|
|
|
|
|
|
|
MouseEventHandler::<OpenSharedScreen, Self>::new(
|
|
|
|
peer_id.as_u64() as usize,
|
|
|
|
cx,
|
|
|
|
|mouse_state, _| {
|
|
|
|
let tree_branch = *tree_branch.in_state(is_selected).style_for(mouse_state);
|
|
|
|
let row = theme
|
|
|
|
.project_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(mouse_state);
|
|
|
|
|
|
|
|
Flex::row()
|
|
|
|
.with_child(
|
|
|
|
Stack::new()
|
|
|
|
.with_child(Canvas::new(move |scene, bounds, _, _, _| {
|
|
|
|
let start_x = bounds.min_x() + (bounds.width() / 2.)
|
|
|
|
- (tree_branch.width / 2.);
|
|
|
|
let end_x = bounds.max_x();
|
|
|
|
let start_y = bounds.min_y();
|
|
|
|
let end_y = bounds.min_y() + baseline_offset - (cap_height / 2.);
|
|
|
|
|
|
|
|
scene.push_quad(gpui::Quad {
|
|
|
|
bounds: RectF::from_points(
|
|
|
|
vec2f(start_x, start_y),
|
|
|
|
vec2f(
|
|
|
|
start_x + tree_branch.width,
|
|
|
|
if is_last { end_y } else { bounds.max_y() },
|
|
|
|
),
|
|
|
|
),
|
|
|
|
background: Some(tree_branch.color),
|
|
|
|
border: gpui::Border::default(),
|
|
|
|
corner_radius: 0.,
|
|
|
|
});
|
|
|
|
scene.push_quad(gpui::Quad {
|
|
|
|
bounds: RectF::from_points(
|
|
|
|
vec2f(start_x, end_y),
|
|
|
|
vec2f(end_x, end_y + tree_branch.width),
|
|
|
|
),
|
|
|
|
background: Some(tree_branch.color),
|
|
|
|
border: gpui::Border::default(),
|
|
|
|
corner_radius: 0.,
|
|
|
|
});
|
|
|
|
}))
|
|
|
|
.constrained()
|
|
|
|
.with_width(host_avatar_height),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
Svg::new("icons/disable_screen_sharing_12.svg")
|
|
|
|
.with_color(row.icon.color)
|
|
|
|
.constrained()
|
|
|
|
.with_width(row.icon.width)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.contained()
|
|
|
|
.with_style(row.icon.container),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
Label::new("Screen", row.name.text.clone())
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.contained()
|
|
|
|
.with_style(row.name.container)
|
|
|
|
.flex(1., false),
|
|
|
|
)
|
|
|
|
.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(row.container)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
if let Some(workspace) = this.workspace.upgrade(cx) {
|
|
|
|
workspace.update(cx, |workspace, cx| {
|
|
|
|
workspace.open_shared_screen(peer_id, cx)
|
|
|
|
});
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_header(
|
|
|
|
section: Section,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
is_selected: bool,
|
|
|
|
is_collapsed: bool,
|
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) -> AnyElement<Self> {
|
|
|
|
enum Header {}
|
|
|
|
enum LeaveCallContactList {}
|
|
|
|
|
|
|
|
let header_style = theme
|
|
|
|
.header_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(&mut Default::default());
|
|
|
|
let text = match section {
|
|
|
|
Section::ActiveCall => "Collaborators",
|
|
|
|
Section::Requests => "Contact Requests",
|
|
|
|
Section::Online => "Online",
|
|
|
|
Section::Offline => "Offline",
|
|
|
|
};
|
|
|
|
let leave_call = if section == Section::ActiveCall {
|
|
|
|
Some(
|
|
|
|
MouseEventHandler::<LeaveCallContactList, Self>::new(0, cx, |state, _| {
|
|
|
|
let style = theme.leave_call.style_for(state);
|
|
|
|
Label::new("Leave Call", style.text.clone())
|
|
|
|
.contained()
|
|
|
|
.with_style(style.container)
|
|
|
|
})
|
|
|
|
.on_click(MouseButton::Left, |_, _, cx| {
|
|
|
|
ActiveCall::global(cx)
|
|
|
|
.update(cx, |call, cx| call.hang_up(cx))
|
|
|
|
.detach_and_log_err(cx);
|
|
|
|
})
|
|
|
|
.aligned(),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
let icon_size = theme.section_icon_size;
|
|
|
|
MouseEventHandler::<Header, Self>::new(section as usize, cx, |_, _| {
|
|
|
|
Flex::row()
|
|
|
|
.with_child(
|
|
|
|
Svg::new(if is_collapsed {
|
|
|
|
"icons/chevron_right_8.svg"
|
|
|
|
} else {
|
|
|
|
"icons/chevron_down_8.svg"
|
|
|
|
})
|
|
|
|
.with_color(header_style.text.color)
|
|
|
|
.constrained()
|
|
|
|
.with_max_width(icon_size)
|
|
|
|
.with_max_height(icon_size)
|
|
|
|
.aligned()
|
|
|
|
.constrained()
|
|
|
|
.with_width(icon_size),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
Label::new(text, header_style.text.clone())
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.contained()
|
|
|
|
.with_margin_left(theme.contact_username.container.margin.left)
|
|
|
|
.flex(1., true),
|
|
|
|
)
|
|
|
|
.with_children(leave_call)
|
|
|
|
.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(header_style.container)
|
|
|
|
})
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
this.toggle_expanded(section, cx);
|
|
|
|
})
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_contact(
|
|
|
|
contact: &Contact,
|
|
|
|
calling: bool,
|
|
|
|
project: &ModelHandle<Project>,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
is_selected: bool,
|
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) -> AnyElement<Self> {
|
|
|
|
let online = contact.online;
|
|
|
|
let busy = contact.busy || calling;
|
|
|
|
let user_id = contact.user.id;
|
|
|
|
let github_login = contact.user.github_login.clone();
|
|
|
|
let initial_project = project.clone();
|
|
|
|
let mut event_handler =
|
|
|
|
MouseEventHandler::<Contact, Self>::new(contact.user.id as usize, cx, |_, cx| {
|
|
|
|
Flex::row()
|
|
|
|
.with_children(contact.user.avatar.clone().map(|avatar| {
|
|
|
|
let status_badge = if contact.online {
|
|
|
|
Some(
|
|
|
|
Empty::new()
|
|
|
|
.collapsed()
|
|
|
|
.contained()
|
|
|
|
.with_style(if busy {
|
|
|
|
theme.contact_status_busy
|
|
|
|
} else {
|
|
|
|
theme.contact_status_free
|
|
|
|
})
|
|
|
|
.aligned(),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
Stack::new()
|
|
|
|
.with_child(
|
|
|
|
Image::from_data(avatar)
|
|
|
|
.with_style(theme.contact_avatar)
|
|
|
|
.aligned()
|
|
|
|
.left(),
|
|
|
|
)
|
|
|
|
.with_children(status_badge)
|
|
|
|
}))
|
|
|
|
.with_child(
|
|
|
|
Label::new(
|
|
|
|
contact.user.github_login.clone(),
|
|
|
|
theme.contact_username.text.clone(),
|
|
|
|
)
|
|
|
|
.contained()
|
|
|
|
.with_style(theme.contact_username.container)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.flex(1., true),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
MouseEventHandler::<Cancel, Self>::new(
|
|
|
|
contact.user.id as usize,
|
|
|
|
cx,
|
|
|
|
|mouse_state, _| {
|
|
|
|
let button_style = theme.contact_button.style_for(mouse_state);
|
|
|
|
render_icon_button(button_style, "icons/x_mark_8.svg")
|
|
|
|
.aligned()
|
|
|
|
.flex_float()
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.with_padding(Padding::uniform(2.))
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
this.remove_contact(user_id, &github_login, cx);
|
|
|
|
})
|
|
|
|
.flex_float(),
|
|
|
|
)
|
|
|
|
.with_children(if calling {
|
|
|
|
Some(
|
|
|
|
Label::new("Calling", theme.calling_indicator.text.clone())
|
|
|
|
.contained()
|
|
|
|
.with_style(theme.calling_indicator.container)
|
|
|
|
.aligned(),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
})
|
|
|
|
.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(
|
|
|
|
*theme
|
|
|
|
.contact_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(&mut Default::default()),
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
if online && !busy {
|
|
|
|
this.call(user_id, Some(initial_project.clone()), cx);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if online {
|
|
|
|
event_handler = event_handler.with_cursor_style(CursorStyle::PointingHand);
|
|
|
|
}
|
|
|
|
|
|
|
|
event_handler.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_contact_request(
|
|
|
|
user: Arc<User>,
|
|
|
|
user_store: ModelHandle<UserStore>,
|
2023-07-25 17:02:01 +00:00
|
|
|
theme: &theme::CollabPanel,
|
2023-07-25 03:00:31 +00:00
|
|
|
is_incoming: bool,
|
|
|
|
is_selected: bool,
|
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) -> AnyElement<Self> {
|
|
|
|
enum Decline {}
|
|
|
|
enum Accept {}
|
|
|
|
enum Cancel {}
|
|
|
|
|
|
|
|
let mut row = Flex::row()
|
|
|
|
.with_children(user.avatar.clone().map(|avatar| {
|
|
|
|
Image::from_data(avatar)
|
|
|
|
.with_style(theme.contact_avatar)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
}))
|
|
|
|
.with_child(
|
|
|
|
Label::new(
|
|
|
|
user.github_login.clone(),
|
|
|
|
theme.contact_username.text.clone(),
|
|
|
|
)
|
|
|
|
.contained()
|
|
|
|
.with_style(theme.contact_username.container)
|
|
|
|
.aligned()
|
|
|
|
.left()
|
|
|
|
.flex(1., true),
|
|
|
|
);
|
|
|
|
|
|
|
|
let user_id = user.id;
|
|
|
|
let github_login = user.github_login.clone();
|
|
|
|
let is_contact_request_pending = user_store.read(cx).is_contact_request_pending(&user);
|
|
|
|
let button_spacing = theme.contact_button_spacing;
|
|
|
|
|
|
|
|
if is_incoming {
|
|
|
|
row.add_child(
|
|
|
|
MouseEventHandler::<Decline, Self>::new(user.id as usize, cx, |mouse_state, _| {
|
|
|
|
let button_style = if is_contact_request_pending {
|
|
|
|
&theme.disabled_button
|
|
|
|
} else {
|
|
|
|
theme.contact_button.style_for(mouse_state)
|
|
|
|
};
|
|
|
|
render_icon_button(button_style, "icons/x_mark_8.svg").aligned()
|
|
|
|
})
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
this.respond_to_contact_request(user_id, false, cx);
|
|
|
|
})
|
|
|
|
.contained()
|
|
|
|
.with_margin_right(button_spacing),
|
|
|
|
);
|
|
|
|
|
|
|
|
row.add_child(
|
|
|
|
MouseEventHandler::<Accept, Self>::new(user.id as usize, cx, |mouse_state, _| {
|
|
|
|
let button_style = if is_contact_request_pending {
|
|
|
|
&theme.disabled_button
|
|
|
|
} else {
|
|
|
|
theme.contact_button.style_for(mouse_state)
|
|
|
|
};
|
|
|
|
render_icon_button(button_style, "icons/check_8.svg")
|
|
|
|
.aligned()
|
|
|
|
.flex_float()
|
|
|
|
})
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
this.respond_to_contact_request(user_id, true, cx);
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
row.add_child(
|
|
|
|
MouseEventHandler::<Cancel, Self>::new(user.id as usize, cx, |mouse_state, _| {
|
|
|
|
let button_style = if is_contact_request_pending {
|
|
|
|
&theme.disabled_button
|
|
|
|
} else {
|
|
|
|
theme.contact_button.style_for(mouse_state)
|
|
|
|
};
|
|
|
|
render_icon_button(button_style, "icons/x_mark_8.svg")
|
|
|
|
.aligned()
|
|
|
|
.flex_float()
|
|
|
|
})
|
|
|
|
.with_padding(Padding::uniform(2.))
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, move |_, this, cx| {
|
|
|
|
this.remove_contact(user_id, &github_login, cx);
|
|
|
|
})
|
|
|
|
.flex_float(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
row.constrained()
|
|
|
|
.with_height(theme.row_height)
|
|
|
|
.contained()
|
|
|
|
.with_style(
|
|
|
|
*theme
|
|
|
|
.contact_row
|
|
|
|
.in_state(is_selected)
|
|
|
|
.style_for(&mut Default::default()),
|
|
|
|
)
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
|
|
|
|
if self.contact_finder.take().is_some() {
|
|
|
|
cx.notify();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let did_clear = self.filter_editor.update(cx, |editor, cx| {
|
|
|
|
if editor.buffer().read(cx).len(cx) > 0 {
|
|
|
|
editor.set_text("", cx);
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if !did_clear {
|
|
|
|
cx.emit(Event::Dismissed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
|
|
|
|
if let Some(ix) = self.selection {
|
|
|
|
if self.entries.len() > ix + 1 {
|
|
|
|
self.selection = Some(ix + 1);
|
|
|
|
}
|
|
|
|
} else if !self.entries.is_empty() {
|
|
|
|
self.selection = Some(0);
|
|
|
|
}
|
|
|
|
self.list_state.reset(self.entries.len());
|
|
|
|
if let Some(ix) = self.selection {
|
|
|
|
self.list_state.scroll_to(ListOffset {
|
|
|
|
item_ix: ix,
|
|
|
|
offset_in_item: 0.,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
cx.notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
|
|
|
|
if let Some(ix) = self.selection {
|
|
|
|
if ix > 0 {
|
|
|
|
self.selection = Some(ix - 1);
|
|
|
|
} else {
|
|
|
|
self.selection = None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.list_state.reset(self.entries.len());
|
|
|
|
if let Some(ix) = self.selection {
|
|
|
|
self.list_state.scroll_to(ListOffset {
|
|
|
|
item_ix: ix,
|
|
|
|
offset_in_item: 0.,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
cx.notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) {
|
|
|
|
if let Some(selection) = self.selection {
|
|
|
|
if let Some(entry) = self.entries.get(selection) {
|
|
|
|
match entry {
|
|
|
|
ContactEntry::Header(section) => {
|
|
|
|
self.toggle_expanded(*section, cx);
|
|
|
|
}
|
|
|
|
ContactEntry::Contact { contact, calling } => {
|
|
|
|
if contact.online && !contact.busy && !calling {
|
|
|
|
self.call(contact.user.id, Some(self.project.clone()), cx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::ParticipantProject {
|
|
|
|
project_id,
|
|
|
|
host_user_id,
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
if let Some(workspace) = self.workspace.upgrade(cx) {
|
|
|
|
let app_state = workspace.read(cx).app_state().clone();
|
|
|
|
workspace::join_remote_project(
|
|
|
|
*project_id,
|
|
|
|
*host_user_id,
|
|
|
|
app_state,
|
|
|
|
cx,
|
|
|
|
)
|
|
|
|
.detach_and_log_err(cx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::ParticipantScreen { peer_id, .. } => {
|
|
|
|
if let Some(workspace) = self.workspace.upgrade(cx) {
|
|
|
|
workspace.update(cx, |workspace, cx| {
|
|
|
|
workspace.open_shared_screen(*peer_id, cx)
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn toggle_expanded(&mut self, section: Section, cx: &mut ViewContext<Self>) {
|
|
|
|
if let Some(ix) = self.collapsed_sections.iter().position(|s| *s == section) {
|
|
|
|
self.collapsed_sections.remove(ix);
|
|
|
|
} else {
|
|
|
|
self.collapsed_sections.push(section);
|
|
|
|
}
|
|
|
|
self.update_entries(cx);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn toggle_contact_finder(&mut self, cx: &mut ViewContext<Self>) {
|
|
|
|
if self.contact_finder.take().is_none() {
|
|
|
|
let child = cx.add_view(|cx| {
|
|
|
|
let finder = build_contact_finder(self.user_store.clone(), cx);
|
|
|
|
finder.set_query(self.filter_editor.read(cx).text(cx), cx);
|
|
|
|
finder
|
|
|
|
});
|
|
|
|
cx.focus(&child);
|
|
|
|
// self.subscription = Some(cx.subscribe(&child, |_, _, event, cx| match event {
|
|
|
|
// // PickerEvent::Dismiss => cx.emit(Event::Dismissed),
|
|
|
|
// }));
|
|
|
|
self.contact_finder = Some(child);
|
|
|
|
}
|
|
|
|
cx.notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn remove_contact(&mut self, user_id: u64, github_login: &str, cx: &mut ViewContext<Self>) {
|
|
|
|
let user_store = self.user_store.clone();
|
|
|
|
let prompt_message = format!(
|
|
|
|
"Are you sure you want to remove \"{}\" from your contacts?",
|
|
|
|
github_login
|
|
|
|
);
|
|
|
|
let mut answer = cx.prompt(PromptLevel::Warning, &prompt_message, &["Remove", "Cancel"]);
|
|
|
|
let window_id = cx.window_id();
|
|
|
|
cx.spawn(|_, mut cx| async move {
|
|
|
|
if answer.next().await == Some(0) {
|
|
|
|
if let Err(e) = user_store
|
|
|
|
.update(&mut cx, |store, cx| store.remove_contact(user_id, cx))
|
|
|
|
.await
|
|
|
|
{
|
|
|
|
cx.prompt(
|
|
|
|
window_id,
|
|
|
|
PromptLevel::Info,
|
|
|
|
&format!("Failed to remove contact: {}", e),
|
|
|
|
&["Ok"],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.detach();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn respond_to_contact_request(
|
|
|
|
&mut self,
|
|
|
|
user_id: u64,
|
|
|
|
accept: bool,
|
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) {
|
|
|
|
self.user_store
|
|
|
|
.update(cx, |store, cx| {
|
|
|
|
store.respond_to_contact_request(user_id, accept, cx)
|
|
|
|
})
|
|
|
|
.detach();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn call(
|
|
|
|
&mut self,
|
|
|
|
recipient_user_id: u64,
|
|
|
|
initial_project: Option<ModelHandle<Project>>,
|
|
|
|
cx: &mut ViewContext<Self>,
|
|
|
|
) {
|
|
|
|
ActiveCall::global(cx)
|
|
|
|
.update(cx, |call, cx| {
|
|
|
|
call.invite(recipient_user_id, initial_project, cx)
|
|
|
|
})
|
|
|
|
.detach_and_log_err(cx);
|
|
|
|
}
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
impl View for CollabPanel {
|
2023-07-19 01:55:54 +00:00
|
|
|
fn ui_name() -> &'static str {
|
2023-07-25 03:00:31 +00:00
|
|
|
"CollabPanel"
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
|
|
|
|
if !self.has_focus {
|
|
|
|
self.has_focus = true;
|
|
|
|
cx.emit(Event::Focus);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn focus_out(&mut self, _: gpui::AnyViewHandle, _: &mut ViewContext<Self>) {
|
|
|
|
self.has_focus = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render(&mut self, cx: &mut gpui::ViewContext<'_, '_, Self>) -> gpui::AnyElement<Self> {
|
2023-07-25 03:00:31 +00:00
|
|
|
enum AddContact {}
|
2023-07-19 01:55:54 +00:00
|
|
|
let theme = theme::current(cx).clone();
|
|
|
|
|
|
|
|
Stack::new()
|
2023-07-25 03:00:31 +00:00
|
|
|
.with_child(if let Some(finder) = &self.contact_finder {
|
|
|
|
ChildView::new(&finder, cx).into_any()
|
|
|
|
} else {
|
2023-07-19 01:55:54 +00:00
|
|
|
Flex::column()
|
|
|
|
.with_child(
|
2023-07-25 03:00:31 +00:00
|
|
|
Flex::row()
|
2023-07-24 21:39:16 +00:00
|
|
|
.with_child(
|
2023-07-25 03:00:31 +00:00
|
|
|
ChildView::new(&self.filter_editor, cx)
|
|
|
|
.contained()
|
2023-07-25 17:02:01 +00:00
|
|
|
.with_style(theme.collab_panel.user_query_editor.container)
|
2023-07-25 03:00:31 +00:00
|
|
|
.flex(1.0, true),
|
|
|
|
)
|
|
|
|
.with_child(
|
|
|
|
MouseEventHandler::<AddContact, Self>::new(0, cx, |_, _| {
|
|
|
|
render_icon_button(
|
2023-07-25 17:02:01 +00:00
|
|
|
&theme.collab_panel.add_contact_button,
|
2023-07-25 03:00:31 +00:00
|
|
|
"icons/user_plus_16.svg",
|
2023-07-24 21:39:16 +00:00
|
|
|
)
|
2023-07-25 03:00:31 +00:00
|
|
|
})
|
|
|
|
.with_cursor_style(CursorStyle::PointingHand)
|
|
|
|
.on_click(MouseButton::Left, |_, this, cx| {
|
|
|
|
this.toggle_contact_finder(cx);
|
|
|
|
})
|
|
|
|
.with_tooltip::<AddContact>(
|
|
|
|
0,
|
|
|
|
"Search for new contact".into(),
|
|
|
|
None,
|
|
|
|
theme.tooltip.clone(),
|
|
|
|
cx,
|
|
|
|
)
|
|
|
|
.constrained()
|
2023-07-25 17:02:01 +00:00
|
|
|
.with_height(theme.collab_panel.user_query_editor_height)
|
|
|
|
.with_width(theme.collab_panel.user_query_editor_height),
|
2023-07-24 21:39:16 +00:00
|
|
|
)
|
2023-07-25 03:00:31 +00:00
|
|
|
.constrained()
|
|
|
|
.with_width(self.size(cx)),
|
2023-07-19 01:55:54 +00:00
|
|
|
)
|
2023-07-25 03:00:31 +00:00
|
|
|
.with_child(
|
|
|
|
List::new(self.list_state.clone())
|
|
|
|
.constrained()
|
|
|
|
.with_width(self.size(cx))
|
|
|
|
.flex(1., true)
|
|
|
|
.into_any(),
|
|
|
|
)
|
|
|
|
.constrained()
|
|
|
|
.with_width(self.size(cx))
|
|
|
|
.into_any()
|
|
|
|
})
|
2023-07-19 01:55:54 +00:00
|
|
|
.with_child(ChildView::new(&self.context_menu, cx))
|
|
|
|
.into_any_named("channels panel")
|
|
|
|
.into_any()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-24 21:39:16 +00:00
|
|
|
impl Panel for CollabPanel {
|
2023-07-19 01:55:54 +00:00
|
|
|
fn position(&self, cx: &gpui::WindowContext) -> DockPosition {
|
|
|
|
match settings::get::<ChannelsPanelSettings>(cx).dock {
|
|
|
|
ChannelsPanelDockPosition::Left => DockPosition::Left,
|
|
|
|
ChannelsPanelDockPosition::Right => DockPosition::Right,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn position_is_valid(&self, position: DockPosition) -> bool {
|
|
|
|
matches!(position, DockPosition::Left | DockPosition::Right)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn set_position(&mut self, position: DockPosition, cx: &mut ViewContext<Self>) {
|
|
|
|
settings::update_settings_file::<ChannelsPanelSettings>(
|
|
|
|
self.fs.clone(),
|
|
|
|
cx,
|
|
|
|
move |settings| {
|
|
|
|
let dock = match position {
|
|
|
|
DockPosition::Left | DockPosition::Bottom => ChannelsPanelDockPosition::Left,
|
|
|
|
DockPosition::Right => ChannelsPanelDockPosition::Right,
|
|
|
|
};
|
|
|
|
settings.dock = Some(dock);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn size(&self, cx: &gpui::WindowContext) -> f32 {
|
|
|
|
self.width
|
|
|
|
.unwrap_or_else(|| settings::get::<ChannelsPanelSettings>(cx).default_width)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn set_size(&mut self, size: f32, cx: &mut ViewContext<Self>) {
|
|
|
|
self.width = Some(size);
|
|
|
|
self.serialize(cx);
|
|
|
|
cx.notify();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn icon_path(&self) -> &'static str {
|
2023-07-24 21:39:16 +00:00
|
|
|
"icons/radix/person.svg"
|
2023-07-19 01:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn icon_tooltip(&self) -> (String, Option<Box<dyn gpui::Action>>) {
|
|
|
|
("Channels Panel".to_string(), Some(Box::new(ToggleFocus)))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn should_change_position_on_event(event: &Self::Event) -> bool {
|
|
|
|
matches!(event, Event::DockPositionChanged)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn has_focus(&self, _cx: &gpui::WindowContext) -> bool {
|
|
|
|
self.has_focus
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_focus_event(event: &Self::Event) -> bool {
|
|
|
|
matches!(event, Event::Focus)
|
|
|
|
}
|
|
|
|
}
|
2023-07-25 03:00:31 +00:00
|
|
|
|
|
|
|
impl PartialEq for ContactEntry {
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
match self {
|
|
|
|
ContactEntry::Header(section_1) => {
|
|
|
|
if let ContactEntry::Header(section_2) = other {
|
|
|
|
return section_1 == section_2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::CallParticipant { user: user_1, .. } => {
|
|
|
|
if let ContactEntry::CallParticipant { user: user_2, .. } = other {
|
|
|
|
return user_1.id == user_2.id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::ParticipantProject {
|
|
|
|
project_id: project_id_1,
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
if let ContactEntry::ParticipantProject {
|
|
|
|
project_id: project_id_2,
|
|
|
|
..
|
|
|
|
} = other
|
|
|
|
{
|
|
|
|
return project_id_1 == project_id_2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::ParticipantScreen {
|
|
|
|
peer_id: peer_id_1, ..
|
|
|
|
} => {
|
|
|
|
if let ContactEntry::ParticipantScreen {
|
|
|
|
peer_id: peer_id_2, ..
|
|
|
|
} = other
|
|
|
|
{
|
|
|
|
return peer_id_1 == peer_id_2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::IncomingRequest(user_1) => {
|
|
|
|
if let ContactEntry::IncomingRequest(user_2) = other {
|
|
|
|
return user_1.id == user_2.id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::OutgoingRequest(user_1) => {
|
|
|
|
if let ContactEntry::OutgoingRequest(user_2) = other {
|
|
|
|
return user_1.id == user_2.id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ContactEntry::Contact {
|
|
|
|
contact: contact_1, ..
|
|
|
|
} => {
|
|
|
|
if let ContactEntry::Contact {
|
|
|
|
contact: contact_2, ..
|
|
|
|
} = other
|
|
|
|
{
|
|
|
|
return contact_1.user.id == contact_2.user.id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn render_icon_button(style: &IconButton, svg_path: &'static str) -> impl Element<CollabPanel> {
|
|
|
|
Svg::new(svg_path)
|
|
|
|
.with_color(style.color)
|
|
|
|
.constrained()
|
|
|
|
.with_width(style.icon_width)
|
|
|
|
.aligned()
|
|
|
|
.contained()
|
|
|
|
.with_style(style.container)
|
|
|
|
.constrained()
|
|
|
|
.with_width(style.button_width)
|
|
|
|
.with_height(style.button_width)
|
|
|
|
}
|