Close modals when focus leaves

Conrad Irwin created 2 years ago

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.

Change summary

crates/workspace/src/modal_layer.rs | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

Detailed changes

crates/workspace/src/modal_layer.rs

@@ -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())),
             )
     }
 }