From 2f3b4088803ccd8fcbf47b3425a7a7a39b8d03f5 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 22 Dec 2023 15:12:01 +0100 Subject: [PATCH] Dismiss mention notification when `x` icon is clicked We were emitting the wrong kind of event, which caused the workspace to never remove the notification. --- crates/collab_ui2/src/notification_panel.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/crates/collab_ui2/src/notification_panel.rs b/crates/collab_ui2/src/notification_panel.rs index d9a26b4064..3ba1f0bd47 100644 --- a/crates/collab_ui2/src/notification_panel.rs +++ b/crates/collab_ui2/src/notification_panel.rs @@ -684,10 +684,6 @@ pub struct NotificationToast { workspace: WeakView, } -pub enum ToastEvent { - Dismiss, -} - impl NotificationToast { fn focus_notification_panel(&self, cx: &mut ViewContext) { let workspace = self.workspace.clone(); @@ -721,16 +717,15 @@ impl Render for NotificationToast { .child(Label::new(self.text.clone())) .child( 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| { this.focus_notification_panel(cx); - cx.emit(ToastEvent::Dismiss); + cx.emit(DismissEvent); })) } } -impl EventEmitter for NotificationToast {} impl EventEmitter for NotificationToast {} fn format_timestamp(