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

Dismiss mention notification when x icon is clicked

Browse source 
We were emitting the wrong kind of event, which caused the workspace
to never remove the notification.
This commit is contained in:
Antonio Scandurra 2023-12-22 15:12:01 +01:00
parent bb93144b8a
commit 2f3b408880
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/collab_ui2/src/notification_panel.rs
View file

@ -684,10 +684,6 @@ pub struct NotificationToast {
workspace: WeakView<Workspace>, workspace: WeakView<Workspace>,
} }
pub enum ToastEvent {
Dismiss,
}
impl NotificationToast { impl NotificationToast {
fn focus_notification_panel(&self, cx: &mut ViewContext<Self>) { fn focus_notification_panel(&self, cx: &mut ViewContext<Self>) {
let workspace = self.workspace.clone(); let workspace = self.workspace.clone();
@ -721,16 +717,15 @@ impl Render for NotificationToast {
.child(Label::new(self.text.clone())) .child(Label::new(self.text.clone()))
.child( .child(
IconButton::new("close", Icon::Close) IconButton::new("close", Icon::Close)
.on_click(cx.listener(|_, _, cx| cx.emit(ToastEvent::Dismiss))), .on_click(cx.listener(|_, _, cx| cx.emit(DismissEvent))),
) )
.on_click(cx.listener(|this, _, cx| { .on_click(cx.listener(|this, _, cx| {
this.focus_notification_panel(cx); this.focus_notification_panel(cx);
cx.emit(ToastEvent::Dismiss); cx.emit(DismissEvent);
})) }))
} }
} }
impl EventEmitter<ToastEvent> for NotificationToast {}
impl EventEmitter<DismissEvent> for NotificationToast {} impl EventEmitter<DismissEvent> for NotificationToast {}
fn format_timestamp( fn format_timestamp(