mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 12:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Close modals when focus leaves

Browse source 
This is more similar to zed1's behaviour, and allows us to work around
the difficulty in defining `on_mouse_down_out` for modals that have
overlays.
This commit is contained in:
Conrad Irwin 2024-01-15 19:20:35 -07:00
parent b565c44a9e
commit 62232060e6
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/workspace/src/modal_layer.rs
View file

@ -27,7 +27,7 @@ impl<V: ModalView> ModalViewHandle for View<V> {
pub struct ActiveModal {
modal: Box<dyn ModalViewHandle>,
_subscription: Subscription,
_subscriptions: [Subscription; 2],
previous_focus_handle: Option<FocusHandle>,
focus_handle: FocusHandle,
}
@ -61,13 +61,19 @@ impl ModalLayer {
where
V: ModalView,
{
let focus_handle = cx.focus_handle();
self.active_modal = Some(ActiveModal {
modal: Box::new(new_modal.clone()),
_subscription: cx.subscribe(&new_modal, |this, _, _: &DismissEvent, cx| {
this.hide_modal(cx);
}),
_subscriptions: [
cx.subscribe(&new_modal, |this, _, _: &DismissEvent, cx| {
this.hide_modal(cx);
}),
cx.on_focus_out(&focus_handle, |this, cx| {
this.hide_modal(cx);
}),
],
previous_focus_handle: cx.focused(),
focus_handle: cx.focus_handle(),
focus_handle,
});
cx.focus_view(&new_modal);
cx.notify();
@ -127,13 +133,7 @@ impl Render for ModalLayer {
.flex_col()
.items_center()
.track_focus(&active_modal.focus_handle)
.child(
h_flex()
.on_mouse_down_out(cx.listener(|this, _, cx| {
this.hide_modal(cx);
}))
.child(active_modal.modal.view()),
),
.child(h_flex().child(active_modal.modal.view())),
)
}
}