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

Make DismissEvent a unit struct

Browse source 
Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-11-29 09:42:54 -08:00
parent ac34229118
commit 233aac5573
11 changed files with 26 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ui2/src/components/context_menu.rs
View file

@ -94,11 +94,11 @@ impl ContextMenu {
{
(handler)(cx)
}
cx.emit(DismissEvent::Dismiss);
cx.emit(DismissEvent);
}
pub fn cancel(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
cx.emit(DismissEvent::Dismiss);
cx.emit(DismissEvent);
}
fn select_first(&mut self, _: &SelectFirst, cx: &mut ViewContext<Self>) {
@ -181,8 +181,7 @@ impl Render for ContextMenu {
key_binding,
} => {
let callback = callback.clone();
let dismiss =
cx.listener(|_, _, cx| cx.emit(DismissEvent::Dismiss));
let dismiss = cx.listener(|_, _, cx| cx.emit(DismissEvent));
ListItem::new(entry.clone())
.child(
@ -348,11 +347,9 @@ impl<M: ManagedView> Element for MenuHandle<M> {
let new_menu = (builder)(cx);
let menu2 = menu.clone();
cx.subscribe(&new_menu, move |_modal, e, cx| match e {
&DismissEvent::Dismiss => {
*menu2.borrow_mut() = None;
cx.notify();
}
cx.subscribe(&new_menu, move |_modal, _: &DismissEvent, cx| {
*menu2.borrow_mut() = None;
cx.notify();
})
.detach();
cx.focus_view(&new_menu);