Merge branch 'main' into welcome2

This commit is contained in:
Mikayla
2023-11-28 15:38:51 -08:00
88 changed files with 2768 additions and 2094 deletions
-4
View File
@@ -95,10 +95,6 @@ impl Render for ModalLayer {
.track_focus(&active_modal.focus_handle)
.child(
h_stack()
// needed to prevent mouse events leaking to the
// UI below. // todo! for gpui3.
.on_any_mouse_down(|_, cx| cx.stop_propagation())
.on_any_mouse_up(|_, cx| cx.stop_propagation())
.on_mouse_down_out(cx.listener(|this, _, cx| {
this.hide_modal(cx);
}))
+5 -6
View File
@@ -2640,12 +2640,11 @@ impl Workspace {
.flex_col()
.justify_end()
.gap_2()
.children(self.notifications.iter().map(|(_, _, notification)| {
div()
.on_any_mouse_down(|_, cx| cx.stop_propagation())
.on_any_mouse_up(|_, cx| cx.stop_propagation())
.child(notification.to_any())
})),
.children(
self.notifications
.iter()
.map(|(_, _, notification)| notification.to_any()),
),
)
}
}