mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix bug in channel rendering

Browse source 
Fix drag and drop stale state bug revealed by the channel panel

co-authored-by: Max <max@zed.dev>
This commit is contained in:
Mikayla 2023-09-20 16:35:37 -07:00
parent 4ff44dfa3b
commit f2f507e619
No known key found for this signature in database
3 changed files with 50 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/channel/src/channel_store.rs
View file

@ -3,10 +3,7 @@ mod channel_index;
use crate::{channel_buffer::ChannelBuffer, channel_chat::ChannelChat}; use crate::{channel_buffer::ChannelBuffer, channel_chat::ChannelChat};
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use client::{Client, Subscription, User, UserId, UserStore}; use client::{Client, Subscription, User, UserId, UserStore};
use collections::{ use collections::{hash_map, HashMap, HashSet};
hash_map::{self, DefaultHasher},
HashMap, HashSet,
};
use futures::{channel::mpsc, future::Shared, Future, FutureExt, StreamExt}; use futures::{channel::mpsc, future::Shared, Future, FutureExt, StreamExt};
use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle}; use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};
use rpc::{ use rpc::{
@ -14,14 +11,7 @@ use rpc::{
TypedEnvelope, TypedEnvelope,
}; };
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use std::{ use std::{borrow::Cow, hash::Hash, mem, ops::Deref, sync::Arc, time::Duration};
borrow::Cow,
hash::{Hash, Hasher},
mem,
ops::Deref,
sync::Arc,
time::Duration,
};
use util::ResultExt; use util::ResultExt;
use self::channel_index::ChannelIndex; use self::channel_index::ChannelIndex;
@ -910,12 +900,6 @@ impl ChannelPath {
pub fn channel_id(&self) -> ChannelId { pub fn channel_id(&self) -> ChannelId {
self.0[self.0.len() - 1] self.0[self.0.len() - 1]
} }
pub fn unique_id(&self) -> u64 {
let mut hasher = DefaultHasher::new();
self.0.deref().hash(&mut hasher);
hasher.finish()
}
} }
impl From<ChannelPath> for Cow<'static, ChannelPath> { impl From<ChannelPath> for Cow<'static, ChannelPath> {

82
crates/collab_ui/src/collab_panel.rs
View file

@ -1787,7 +1787,7 @@ impl CollabPanel {
is_dragged_over = true; is_dragged_over = true;
} }
MouseEventHandler::new::<Channel, _>(path.unique_id() as usize, cx, |state, cx| { MouseEventHandler::new::<Channel, _>(ix, cx, |state, cx| {
let row_hovered = state.hovered(); let row_hovered = state.hovered();
let mut select_state = |interactive: &Interactive<ContainerStyle>| { let mut select_state = |interactive: &Interactive<ContainerStyle>| {
@ -1822,47 +1822,43 @@ impl CollabPanel {
.flex(1., true), .flex(1., true),
) )
.with_child( .with_child(
MouseEventHandler::new::<ChannelCall, _>( MouseEventHandler::new::<ChannelCall, _>(ix, cx, move |_, cx| {
channel.id as usize, let participants =
cx, self.channel_store.read(cx).channel_participants(channel_id);
move |_, cx| { if !participants.is_empty() {
let participants = let extra_count = participants.len().saturating_sub(FACEPILE_LIMIT);
self.channel_store.read(cx).channel_participants(channel_id);
if !participants.is_empty() {
let extra_count = participants.len().saturating_sub(FACEPILE_LIMIT);
FacePile::new(theme.face_overlap) FacePile::new(theme.face_overlap)
.with_children( .with_children(
participants participants
.iter() .iter()
.filter_map(|user| { .filter_map(|user| {
Some( Some(
Image::from_data(user.avatar.clone()?) Image::from_data(user.avatar.clone()?)
.with_style(theme.channel_avatar), .with_style(theme.channel_avatar),
) )
}) })
.take(FACEPILE_LIMIT), .take(FACEPILE_LIMIT),
)
.with_children((extra_count > 0).then(|| {
Label::new(
format!("+{}", extra_count),
theme.extra_participant_label.text.clone(),
) )
.with_children((extra_count > 0).then(|| { .contained()
Label::new( .with_style(theme.extra_participant_label.container)
format!("+{}", extra_count), }))
theme.extra_participant_label.text.clone(), .into_any()
) } else if row_hovered {
.contained() Svg::new("icons/speaker-loud.svg")
.with_style(theme.extra_participant_label.container) .with_color(theme.channel_hash.color)
})) .constrained()
.into_any() .with_width(theme.channel_hash.width)
} else if row_hovered { .into_any()
Svg::new("icons/speaker-loud.svg") } else {
.with_color(theme.channel_hash.color) Empty::new().into_any()
.constrained() }
.with_width(theme.channel_hash.width) })
.into_any()
} else {
Empty::new().into_any()
}
},
)
.on_click(MouseButton::Left, move |_, this, cx| { .on_click(MouseButton::Left, move |_, this, cx| {
this.join_channel_call(channel_id, cx); this.join_channel_call(channel_id, cx);
}), }),
@ -1875,7 +1871,7 @@ impl CollabPanel {
location: path.clone(), location: path.clone(),
}), }),
) )
.with_id(path.unique_id() as usize) .with_id(ix)
.with_style(theme.disclosure.clone()) .with_style(theme.disclosure.clone())
.element() .element()
.constrained() .constrained()
@ -1955,11 +1951,11 @@ impl CollabPanel {
}) })
.as_draggable( .as_draggable(
(channel.clone(), path.parent_id()), (channel.clone(), path.parent_id()),
move |e, (channel, _), cx: &mut ViewContext<Workspace>| { move |modifiers, (channel, _), cx: &mut ViewContext<Workspace>| {
let theme = &theme::current(cx).collab_panel; let theme = &theme::current(cx).collab_panel;
Flex::<Workspace>::row() Flex::<Workspace>::row()
.with_children(e.alt.then(|| { .with_children(modifiers.alt.then(|| {
Svg::new("icons/plus.svg") Svg::new("icons/plus.svg")
.with_color(theme.channel_hash.color) .with_color(theme.channel_hash.color)
.constrained() .constrained()

12
crates/drag_and_drop/src/drag_and_drop.rs
View file

@ -364,9 +364,15 @@ impl<V: 'static> Draggable<V> for MouseEventHandler<V> {
DragAndDrop::<D>::drag_started(e, cx); DragAndDrop::<D>::drag_started(e, cx);
}) })
.on_drag(MouseButton::Left, move |e, _, cx| { .on_drag(MouseButton::Left, move |e, _, cx| {
let payload = payload.clone(); if e.end {
let render = render.clone(); cx.update_global::<DragAndDrop<D>, _, _>(|drag_and_drop, cx| {
DragAndDrop::<D>::dragging(e, payload, cx, render) drag_and_drop.finish_dragging(cx)
})
} else {
let payload = payload.clone();
let render = render.clone();
DragAndDrop::<D>::dragging(e, payload, cx, render)
}
}) })
} }
} }