Disable events when project becomes read-only

Antonio Scandurra and Nathan Sobo created 3 years ago

Co-Authored-By: Nathan Sobo <[e-mail]>

Change summary

crates/gpui/src/elements/event_handler.rs | 16 ++++
crates/workspace/src/workspace.rs         | 87 ++++++++++++++----------
2 files changed, 67 insertions(+), 36 deletions(-)

Detailed changes

crates/gpui/src/elements/event_handler.rs

@@ -8,6 +8,7 @@ use crate::{
 
 pub struct EventHandler {
     child: ElementBox,
+    capture: Option<Box<dyn FnMut(&Event, RectF, &mut EventContext) -> bool>>,
     mouse_down: Option<Box<dyn FnMut(&mut EventContext) -> bool>>,
 }
 
@@ -15,6 +16,7 @@ impl EventHandler {
     pub fn new(child: ElementBox) -> Self {
         Self {
             child,
+            capture: None,
             mouse_down: None,
         }
     }
@@ -26,6 +28,14 @@ impl EventHandler {
         self.mouse_down = Some(Box::new(callback));
         self
     }
+
+    pub fn capture<F>(mut self, callback: F) -> Self
+    where
+        F: 'static + FnMut(&Event, RectF, &mut EventContext) -> bool,
+    {
+        self.capture = Some(Box::new(callback));
+        self
+    }
 }
 
 impl Element for EventHandler {
@@ -59,6 +69,12 @@ impl Element for EventHandler {
         _: &mut Self::PaintState,
         cx: &mut EventContext,
     ) -> bool {
+        if let Some(capture) = self.capture.as_mut() {
+            if capture(event, bounds, cx) {
+                return true;
+            }
+        }
+
         if self.child.dispatch_event(event, cx) {
             true
         } else {

crates/workspace/src/workspace.rs

@@ -1308,13 +1308,17 @@ impl Workspace {
         if self.project.read(cx).is_read_only() {
             let theme = &self.settings.borrow().theme;
             Some(
-                Label::new(
-                    "Your connection to the remote project has been lost.".to_string(),
-                    theme.workspace.disconnected_overlay.text.clone(),
+                EventHandler::new(
+                    Label::new(
+                        "Your connection to the remote project has been lost.".to_string(),
+                        theme.workspace.disconnected_overlay.text.clone(),
+                    )
+                    .aligned()
+                    .contained()
+                    .with_style(theme.workspace.disconnected_overlay.container)
+                    .boxed(),
                 )
-                .aligned()
-                .contained()
-                .with_style(theme.workspace.disconnected_overlay.container)
+                .capture(|_, _, _| true)
                 .boxed(),
             )
         } else {
@@ -1335,40 +1339,51 @@ impl View for Workspace {
     fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
         let settings = self.settings.borrow();
         let theme = &settings.theme;
-        Flex::column()
-            .with_child(self.render_titlebar(&theme, cx))
+        Stack::new()
             .with_child(
-                Stack::new()
-                    .with_child({
-                        let mut content = Flex::row();
-                        content.add_child(self.left_sidebar.render(&settings, cx));
-                        if let Some(element) = self.left_sidebar.render_active_item(&settings, cx) {
-                            content.add_child(Flexible::new(0.8, false, element).boxed());
-                        }
-                        content.add_child(
-                            Flex::column()
-                                .with_child(
-                                    Flexible::new(1., true, self.center.render(&settings.theme))
+                Flex::column()
+                    .with_child(self.render_titlebar(&theme, cx))
+                    .with_child(
+                        Stack::new()
+                            .with_child({
+                                let mut content = Flex::row();
+                                content.add_child(self.left_sidebar.render(&settings, cx));
+                                if let Some(element) =
+                                    self.left_sidebar.render_active_item(&settings, cx)
+                                {
+                                    content.add_child(Flexible::new(0.8, false, element).boxed());
+                                }
+                                content.add_child(
+                                    Flex::column()
+                                        .with_child(
+                                            Flexible::new(
+                                                1.,
+                                                true,
+                                                self.center.render(&settings.theme),
+                                            )
+                                            .boxed(),
+                                        )
+                                        .with_child(ChildView::new(&self.status_bar).boxed())
+                                        .flexible(1., true)
                                         .boxed(),
-                                )
-                                .with_child(ChildView::new(&self.status_bar).boxed())
-                                .flexible(1., true)
-                                .boxed(),
-                        );
-                        if let Some(element) = self.right_sidebar.render_active_item(&settings, cx)
-                        {
-                            content.add_child(Flexible::new(0.8, false, element).boxed());
-                        }
-                        content.add_child(self.right_sidebar.render(&settings, cx));
-                        content.boxed()
-                    })
-                    .with_children(self.modal.as_ref().map(|m| ChildView::new(m).boxed()))
-                    .with_children(self.render_disconnected_overlay(cx))
-                    .flexible(1.0, true)
+                                );
+                                if let Some(element) =
+                                    self.right_sidebar.render_active_item(&settings, cx)
+                                {
+                                    content.add_child(Flexible::new(0.8, false, element).boxed());
+                                }
+                                content.add_child(self.right_sidebar.render(&settings, cx));
+                                content.boxed()
+                            })
+                            .with_children(self.modal.as_ref().map(|m| ChildView::new(m).boxed()))
+                            .flexible(1.0, true)
+                            .boxed(),
+                    )
+                    .contained()
+                    .with_background_color(settings.theme.workspace.background)
                     .boxed(),
             )
-            .contained()
-            .with_background_color(settings.theme.workspace.background)
+            .with_children(self.render_disconnected_overlay(cx))
             .named("workspace")
     }