Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More drag'n'drop fixes

Browse source 
Co-Authored-By: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2023-11-29 12:35:25 -07:00
parent e377bd805b
commit 7e5aa5ce77
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/collab_ui2/src/collab_panel.rs
View file

@ -179,8 +179,8 @@ use project::Fs;
use serde_derive::{Deserialize, Serialize};
use settings::{Settings, SettingsStore};
use ui::{
h_stack, v_stack, Avatar, Button, Color, ContextMenu, Icon, IconButton, IconElement, Label,
List, ListHeader, ListItem, Toggle, Tooltip,
h_stack, v_stack, Avatar, Button, Color, ContextMenu, Icon, IconButton, IconElement, IconSize,
Label, List, ListHeader, ListItem, Toggle, Tooltip,
};
use util::{maybe, ResultExt, TryFutureExt};
use workspace::{
@ -2802,6 +2802,9 @@ impl CollabPanel {
cx.build_view({ |cx| DraggedChannelView { channel, width } })
}
})
.drag_over::<DraggedChannelView>(|style| {
style.bg(cx.theme().colors().ghost_element_hover)
})
.on_drop(
cx.listener(move |this, view: &View<DraggedChannelView>, cx| {
this.channel_store
@ -3588,13 +3591,17 @@ impl Render for DraggedChannelView {
.w(self.width)
.p_1()
.gap_1()
.child(IconElement::new(
if self.channel.visibility == proto::ChannelVisibility::Public {
Icon::Public
} else {
Icon::Hash
},
))
.child(
IconElement::new(
if self.channel.visibility == proto::ChannelVisibility::Public {
Icon::Public
} else {
Icon::Hash
},
)
.size(IconSize::Small)
.color(Color::Muted),
)
.child(Label::new(self.channel.name.clone()))
}
}