Add more view tracking (#24683)

This should fix a panic in `Window::current_view()`

Release Notes:

- N/A

crates/gpui/src/view.rs

@@ -40,7 +40,9 @@ impl<V: Render> Element for Entity<V> {
         cx: &mut App,
     ) -> (LayoutId, Self::RequestLayoutState) {
         let mut element = self.update(cx, |view, cx| view.render(window, cx).into_any_element());
-        let layout_id = element.request_layout(window, cx);
+        let layout_id = window.with_rendered_view(self.entity_id(), |window| {
+            element.request_layout(window, cx)
+        });
         (layout_id, element)
     }
 
@@ -53,7 +55,7 @@ impl<V: Render> Element for Entity<V> {
         cx: &mut App,
     ) {
         window.set_view_id(self.entity_id());
-        element.prepaint(window, cx);
+        window.with_rendered_view(self.entity_id(), |window| element.prepaint(window, cx));
     }
 
     fn paint(
@@ -65,7 +67,7 @@ impl<V: Render> Element for Entity<V> {
         window: &mut Window,
         cx: &mut App,
     ) {
-        element.paint(window, cx);
+        window.with_rendered_view(self.entity_id(), |window| element.paint(window, cx));
     }
 }
 
@@ -150,18 +152,18 @@ impl Element for AnyView {
         window: &mut Window,
         cx: &mut App,
     ) -> (LayoutId, Self::RequestLayoutState) {
+        window.with_rendered_view(self.entity_id(), |window| {
             if let Some(style) = self.cached_style.as_ref() {
                 let mut root_style = Style::default();
                 root_style.refine(style);
                 let layout_id = window.request_layout(root_style, None, cx);
                 (layout_id, None)
             } else {
-            window.with_rendered_view(self.entity_id(), |window| {
                 let mut element = (self.render)(self, window, cx);
                 let layout_id = element.request_layout(window, cx);
                 (layout_id, Some(element))
-            })
             }
+        })
     }
 
     fn prepaint(
@@ -173,6 +175,7 @@ impl Element for AnyView {
         cx: &mut App,
     ) -> Option<AnyElement> {
         window.set_view_id(self.entity_id());
+        window.with_rendered_view(self.entity_id(), |window| {
             if self.cached_style.is_some() {
                 window.with_element_state::<AnyViewState, _>(
                     global_id.unwrap(),
@@ -200,14 +203,11 @@ impl Element for AnyView {
 
                         let refreshing = mem::replace(&mut window.refreshing, true);
                         let prepaint_start = window.prepaint_index();
-                    let (mut element, accessed_entities) =
+                        let (mut element, accessed_entities) = cx.detect_accessed_entities(|cx| {
-                        window.with_rendered_view(self.entity_id(), |window| {
-                            cx.detect_accessed_entities(|cx| {
                             let mut element = (self.render)(self, window, cx);
                             element.layout_as_root(bounds.size.into(), window, cx);
                             element.prepaint_at(bounds.origin, window, cx);
                             element
-                            })
                         });
 
                         let prepaint_end = window.prepaint_index();
@@ -230,12 +230,11 @@ impl Element for AnyView {
                 )
             } else {
                 let mut element = element.take().unwrap();
-            window.with_rendered_view(self.entity_id(), |window| {
                 element.prepaint(window, cx);
-            });
 
                 Some(element)
             }
+        })
     }
 
     fn paint(
@@ -247,6 +246,7 @@ impl Element for AnyView {
         window: &mut Window,
         cx: &mut App,
     ) {
+        window.with_rendered_view(self.entity_id(), |window| {
             if self.cached_style.is_some() {
                 window.with_element_state::<AnyViewState, _>(
                     global_id.unwrap(),
@@ -257,9 +257,7 @@ impl Element for AnyView {
 
                         if let Some(element) = element {
                             let refreshing = mem::replace(&mut window.refreshing, true);
-                        window.with_rendered_view(self.entity_id(), |window| {
                             element.paint(window, cx);
-                        });
                             window.refreshing = refreshing;
                         } else {
                             window.reuse_paint(element_state.paint_range.clone());
@@ -274,6 +272,7 @@ impl Element for AnyView {
             } else {
                 element.as_mut().unwrap().paint(window, cx);
             }
+        });
     }
 }
 

crates/gpui/src/window.rs

@@ -477,6 +477,7 @@ pub(crate) struct TooltipRequest {
 }
 
 pub(crate) struct DeferredDraw {
+    current_view: EntityId,
     priority: usize,
     parent_node: DispatchNodeId,
     element_id_stack: SmallVec<[ElementId; 32]>,
@@ -1750,9 +1751,11 @@ impl Window {
 
             let prepaint_start = self.prepaint_index();
             if let Some(element) = deferred_draw.element.as_mut() {
-                self.with_absolute_element_offset(deferred_draw.absolute_offset, |window| {
+                self.with_rendered_view(deferred_draw.current_view, |window| {
+                    window.with_absolute_element_offset(deferred_draw.absolute_offset, |window| {
                         element.prepaint(window, cx)
                     });
+                })
             } else {
                 self.reuse_prepaint(deferred_draw.prepaint_range.clone());
             }
@@ -1783,7 +1786,9 @@ impl Window {
 
             let paint_start = self.paint_index();
             if let Some(element) = deferred_draw.element.as_mut() {
-                element.paint(self, cx);
+                self.with_rendered_view(deferred_draw.current_view, |window| {
+                    element.paint(window, cx);
+                })
             } else {
                 self.reuse_paint(deferred_draw.paint_range.clone());
             }
@@ -1841,6 +1846,7 @@ impl Window {
                 [range.start.deferred_draws_index..range.end.deferred_draws_index]
                 .iter()
                 .map(|deferred_draw| DeferredDraw {
+                    current_view: deferred_draw.current_view,
                     parent_node: reused_subtree.refresh_node_id(deferred_draw.parent_node),
                     element_id_stack: deferred_draw.element_id_stack.clone(),
                     text_style_stack: deferred_draw.text_style_stack.clone(),
@@ -2247,6 +2253,7 @@ impl Window {
         self.invalidator.debug_assert_prepaint();
         let parent_node = self.next_frame.dispatch_tree.active_node_id().unwrap();
         self.next_frame.deferred_draws.push(DeferredDraw {
+            current_view: self.current_view(),
             parent_node,
             element_id_stack: self.element_id_stack.clone(),
             text_style_stack: self.text_style_stack.clone(),