From 58bae3a9a7b9e8135a2deb4f908f64037500eed0 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 12 Jul 2021 17:44:10 +0200
Subject: [PATCH] Ensure root view is always rendered when opening a window

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 gpui/src/app.rs | 73 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/gpui/src/app.rs b/gpui/src/app.rs
index 439e75e973..b81848bfa2 100644
--- a/gpui/src/app.rs
+++ b/gpui/src/app.rs
@@ -977,7 +977,10 @@ impl MutableAppContext {
             },
         );
         self.open_platform_window(window_id);
-        root_view.update(self, |view, cx| view.on_focus(cx));
+        root_view.update(self, |view, cx| {
+            view.on_focus(cx);
+            cx.notify();
+        });
         self.flush_effects();
 
         (window_id, root_view)
@@ -1594,6 +1597,31 @@ pub enum Effect {
     },
 }
 
+impl Debug for Effect {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Effect::Event { entity_id, .. } => f
+                .debug_struct("Effect::Event")
+                .field("entity_id", entity_id)
+                .finish(),
+            Effect::ModelNotification { model_id } => f
+                .debug_struct("Effect::ModelNotification")
+                .field("model_id", model_id)
+                .finish(),
+            Effect::ViewNotification { window_id, view_id } => f
+                .debug_struct("Effect::ViewNotification")
+                .field("window_id", window_id)
+                .field("view_id", view_id)
+                .finish(),
+            Effect::Focus { window_id, view_id } => f
+                .debug_struct("Effect::Focus")
+                .field("window_id", window_id)
+                .field("view_id", view_id)
+                .finish(),
+        }
+    }
+}
+
 pub trait AnyModel: Send + Sync {
     fn as_any(&self) -> &dyn Any;
     fn as_any_mut(&mut self) -> &mut dyn Any;
@@ -2798,6 +2826,7 @@ mod tests {
     use super::*;
     use crate::elements::*;
     use smol::future::poll_once;
+    use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 
     #[crate::test(self)]
     fn test_model_handles(cx: &mut MutableAppContext) {
@@ -2992,6 +3021,48 @@ mod tests {
         assert!(cx.model_observations.is_empty());
     }
 
+    #[crate::test(self)]
+    fn test_add_window(cx: &mut MutableAppContext) {
+        struct View {
+            mouse_down_count: Arc<AtomicUsize>,
+        }
+
+        impl Entity for View {
+            type Event = ();
+        }
+
+        impl super::View for View {
+            fn render<'a>(&self, _: &AppContext) -> ElementBox {
+                let mouse_down_count = self.mouse_down_count.clone();
+                EventHandler::new(Empty::new().boxed())
+                    .on_mouse_down(move |_| {
+                        mouse_down_count.fetch_add(1, SeqCst);
+                        true
+                    })
+                    .boxed()
+            }
+
+            fn ui_name() -> &'static str {
+                "View"
+            }
+        }
+
+        let mouse_down_count = Arc::new(AtomicUsize::new(0));
+        let (window_id, _) = cx.add_window(|_| View {
+            mouse_down_count: mouse_down_count.clone(),
+        });
+        let presenter = cx.presenters_and_platform_windows[&window_id].0.clone();
+        // Ensure window's root element is in a valid lifecycle state.
+        presenter.borrow_mut().dispatch_event(
+            Event::LeftMouseDown {
+                position: Default::default(),
+                cmd: false,
+            },
+            cx,
+        );
+        assert_eq!(mouse_down_count.load(SeqCst), 1);
+    }
+
     #[crate::test(self)]
     fn test_entity_release_hooks(cx: &mut MutableAppContext) {
         struct Model {