diff --git a/gpui/examples/text.rs b/gpui/examples/text.rs
index 08959b77a2f72652ed609e95c92d77be075e4c71..1d092a0da7eb7baea312ff8b09ad78a3acbcf457 100644
--- a/gpui/examples/text.rs
+++ b/gpui/examples/text.rs
@@ -46,14 +46,6 @@ impl gpui::Element for TextElement {
         (constraint.max, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: pathfinder_geometry::vector::Vector2F,
-        _: &mut Self::LayoutState,
-        _: &mut gpui::AfterLayoutContext,
-    ) {
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements.rs b/gpui/src/elements.rs
index 14d33b8e9028e4ab3b1fe21ceab88a68ee58bafc..e390e84653981daf0b06ce8c0edd19eda259123b 100644
--- a/gpui/src/elements.rs
+++ b/gpui/src/elements.rs
@@ -59,13 +59,6 @@ pub trait Element {
         cx: &mut LayoutContext,
     ) -> (Vector2F, Self::LayoutState);
 
-    fn after_layout(
-        &mut self,
-        size: Vector2F,
-        layout: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    );
-
     fn paint(
         &mut self,
         bounds: RectF,
@@ -163,20 +156,6 @@ impl<T: Element> AnyElement for Lifecycle<T> {
         result
     }
 
-    fn after_layout(&mut self, cx: &mut AfterLayoutContext) {
-        if let Lifecycle::PostLayout {
-            element,
-            size,
-            layout,
-            ..
-        } = self
-        {
-            element.after_layout(*size, layout, cx);
-        } else {
-            panic!("invalid element lifecycle state");
-        }
-    }
-
     fn paint(&mut self, origin: Vector2F, cx: &mut PaintContext) {
         *self = if let Lifecycle::PostLayout {
             mut element,
diff --git a/gpui/src/elements/align.rs b/gpui/src/elements/align.rs
index 5b3fd5d0b51f62c7ca36ab85afe2900d783efb60..8963e063b6b7bbb3efc9d7a24f18d25be3a407a2 100644
--- a/gpui/src/elements/align.rs
+++ b/gpui/src/elements/align.rs
@@ -1,6 +1,6 @@
 use crate::{
-    json, AfterLayoutContext, DebugContext, Element, ElementBox, Event, EventContext,
-    LayoutContext, PaintContext, SizeConstraint,
+    json, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
+    SizeConstraint,
 };
 use json::ToJson;
 use pathfinder_geometry::vector::Vector2F;
@@ -51,15 +51,6 @@ impl Element for Align {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: pathfinder_geometry::rect::RectF,
diff --git a/gpui/src/elements/canvas.rs b/gpui/src/elements/canvas.rs
index e90c377be13c1285e5ff508e042089b6984efb46..2e9d5d9e883dfacd533423970b88d338809b51d3 100644
--- a/gpui/src/elements/canvas.rs
+++ b/gpui/src/elements/canvas.rs
@@ -56,14 +56,6 @@ where
         self.0(bounds, cx)
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        _: &mut crate::AfterLayoutContext,
-    ) {
-    }
-
     fn dispatch_event(
         &mut self,
         _: &crate::Event,
diff --git a/gpui/src/elements/constrained_box.rs b/gpui/src/elements/constrained_box.rs
index 3d50b70a57fb8a74c25a8b68f001acb7aa7ddf55..f7949274020748e2ed5f537ff5136cce03eceb1c 100644
--- a/gpui/src/elements/constrained_box.rs
+++ b/gpui/src/elements/constrained_box.rs
@@ -3,8 +3,8 @@ use serde_json::json;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AfterLayoutContext, DebugContext, Element, ElementBox, Event, EventContext,
-    LayoutContext, PaintContext, SizeConstraint,
+    json, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
+    SizeConstraint,
 };
 
 pub struct ConstrainedBox {
@@ -67,15 +67,6 @@ impl Element for ConstrainedBox {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/container.rs b/gpui/src/elements/container.rs
index ae13b5d82116539ac1cefc2ef5c8b66bbf1ff644..fc7fc941cf7edd63cd8ef4a7bd446b48195b23ca 100644
--- a/gpui/src/elements/container.rs
+++ b/gpui/src/elements/container.rs
@@ -10,8 +10,7 @@ use crate::{
     },
     json::ToJson,
     scene::{self, Border, Quad},
-    AfterLayoutContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
-    SizeConstraint,
+    Element, ElementBox, Event, EventContext, LayoutContext, PaintContext, SizeConstraint,
 };
 
 #[derive(Clone, Debug, Default, Deserialize)]
@@ -167,15 +166,6 @@ impl Element for Container {
         (child_size + size_buffer, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/empty.rs b/gpui/src/elements/empty.rs
index fe9ff3c9b90862443be9b7c6eb17ff7d23251808..3c706cc379133cd88c78f2faaf5c2e4190e78431 100644
--- a/gpui/src/elements/empty.rs
+++ b/gpui/src/elements/empty.rs
@@ -6,9 +6,7 @@ use crate::{
     json::{json, ToJson},
     DebugContext,
 };
-use crate::{
-    AfterLayoutContext, Element, Event, EventContext, LayoutContext, PaintContext, SizeConstraint,
-};
+use crate::{Element, Event, EventContext, LayoutContext, PaintContext, SizeConstraint};
 
 pub struct Empty;
 
@@ -41,9 +39,6 @@ impl Element for Empty {
         (vec2f(x, y), ())
     }
 
-    fn after_layout(&mut self, _: Vector2F, _: &mut Self::LayoutState, _: &mut AfterLayoutContext) {
-    }
-
     fn paint(
         &mut self,
         _: RectF,
diff --git a/gpui/src/elements/event_handler.rs b/gpui/src/elements/event_handler.rs
index a66778f8b7c91d979ee13eb4fd1de804702f4eb0..686bfd7acce704aaad3b08098adbc1e8b7d26f91 100644
--- a/gpui/src/elements/event_handler.rs
+++ b/gpui/src/elements/event_handler.rs
@@ -2,8 +2,8 @@ use pathfinder_geometry::rect::RectF;
 use serde_json::json;
 
 use crate::{
-    geometry::vector::Vector2F, AfterLayoutContext, DebugContext, Element, ElementBox, Event,
-    EventContext, LayoutContext, PaintContext, SizeConstraint,
+    geometry::vector::Vector2F, DebugContext, Element, ElementBox, Event, EventContext,
+    LayoutContext, PaintContext, SizeConstraint,
 };
 
 pub struct EventHandler {
@@ -41,15 +41,6 @@ impl Element for EventHandler {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/flex.rs b/gpui/src/elements/flex.rs
index 1ed9204de4796fc45056acaf16f550de7a181287..8bec507d9f692e104c50b3c419b005b8605d546a 100644
--- a/gpui/src/elements/flex.rs
+++ b/gpui/src/elements/flex.rs
@@ -2,8 +2,8 @@ use std::{any::Any, f32::INFINITY};
 
 use crate::{
     json::{self, ToJson, Value},
-    AfterLayoutContext, Axis, DebugContext, Element, ElementBox, Event, EventContext,
-    LayoutContext, PaintContext, SizeConstraint, Vector2FExt,
+    Axis, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
+    SizeConstraint, Vector2FExt,
 };
 use pathfinder_geometry::{
     rect::RectF,
@@ -134,17 +134,6 @@ impl Element for Flex {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        for child in &mut self.children {
-            child.after_layout(cx);
-        }
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
@@ -223,15 +212,6 @@ impl Element for Expanded {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/label.rs b/gpui/src/elements/label.rs
index 72f755905cad91b179b9b9421c5feeec0a3b7c5f..5c0e7e247f8f6384efbdd3e51e7a080ffbdcf9b1 100644
--- a/gpui/src/elements/label.rs
+++ b/gpui/src/elements/label.rs
@@ -8,8 +8,8 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::Line,
-    AfterLayoutContext, DebugContext, Element, Event, EventContext, FontCache, LayoutContext,
-    PaintContext, SizeConstraint,
+    DebugContext, Element, Event, EventContext, FontCache, LayoutContext, PaintContext,
+    SizeConstraint,
 };
 use serde::Deserialize;
 use serde_json::json;
@@ -140,9 +140,6 @@ impl Element for Label {
         (size, line)
     }
 
-    fn after_layout(&mut self, _: Vector2F, _: &mut Self::LayoutState, _: &mut AfterLayoutContext) {
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/line_box.rs b/gpui/src/elements/line_box.rs
index 16baf6e00ba5d483891a41088248bf32fd4b1270..b6ce6d9e9544e274a60aa67783cad25577da2f9d 100644
--- a/gpui/src/elements/line_box.rs
+++ b/gpui/src/elements/line_box.rs
@@ -6,8 +6,8 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    AfterLayoutContext, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext,
-    PaintContext, SizeConstraint,
+    DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
+    SizeConstraint,
 };
 
 pub struct LineBox {
@@ -60,15 +60,6 @@ impl Element for LineBox {
         }
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: pathfinder_geometry::rect::RectF,
diff --git a/gpui/src/elements/list.rs b/gpui/src/elements/list.rs
index 16531144b88e6f287a3da15235009c9a393ca71c..d96637ea864574ced7b7df3b5a71a1f281e0f152 100644
--- a/gpui/src/elements/list.rs
+++ b/gpui/src/elements/list.rs
@@ -44,15 +44,6 @@ impl Element for List {
         todo!()
     }
 
-    fn after_layout(
-        &mut self,
-        size: Vector2F,
-        layout: &mut Self::LayoutState,
-        cx: &mut crate::AfterLayoutContext,
-    ) {
-        todo!()
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/mouse_event_handler.rs b/gpui/src/elements/mouse_event_handler.rs
index 2fc310e8252b88d79217e5783dea6ba3ca53a207..629a9824ff59041295b685f77918ccd92271e3f1 100644
--- a/gpui/src/elements/mouse_event_handler.rs
+++ b/gpui/src/elements/mouse_event_handler.rs
@@ -1,7 +1,7 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    AfterLayoutContext, AppContext, DebugContext, Element, ElementBox, Event, EventContext,
-    LayoutContext, PaintContext, SizeConstraint, ValueHandle,
+    AppContext, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext,
+    PaintContext, SizeConstraint, ValueHandle,
 };
 use serde_json::json;
 
@@ -51,15 +51,6 @@ impl Element for MouseEventHandler {
         (self.child.layout(constraint, cx), ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        self.child.after_layout(cx);
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/stack.rs b/gpui/src/elements/stack.rs
index cfc4d9cc6cfc486a55d26f9c4df333bfe47b346b..5c4f91e0ab5c7ded935f7adcbdf7a29ab5bda52b 100644
--- a/gpui/src/elements/stack.rs
+++ b/gpui/src/elements/stack.rs
@@ -1,8 +1,8 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    AfterLayoutContext, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext,
-    PaintContext, SizeConstraint,
+    DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
+    SizeConstraint,
 };
 
 pub struct Stack {
@@ -33,17 +33,6 @@ impl Element for Stack {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        for child in &mut self.children {
-            child.after_layout(cx);
-        }
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/elements/svg.rs b/gpui/src/elements/svg.rs
index 93d26f9656a45ba2328972c99226cc6a3c58588b..2cf8f07b6038b9bfc2ee3b202590cba33f7481ac 100644
--- a/gpui/src/elements/svg.rs
+++ b/gpui/src/elements/svg.rs
@@ -8,8 +8,7 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    scene, AfterLayoutContext, DebugContext, Element, Event, EventContext, LayoutContext,
-    PaintContext, SizeConstraint,
+    scene, DebugContext, Element, Event, EventContext, LayoutContext, PaintContext, SizeConstraint,
 };
 
 pub struct Svg {
@@ -66,9 +65,6 @@ impl Element for Svg {
         }
     }
 
-    fn after_layout(&mut self, _: Vector2F, _: &mut Self::LayoutState, _: &mut AfterLayoutContext) {
-    }
-
     fn paint(&mut self, bounds: RectF, svg: &mut Self::LayoutState, cx: &mut PaintContext) {
         if let Some(svg) = svg.clone() {
             cx.scene.push_icon(scene::Icon {
diff --git a/gpui/src/elements/uniform_list.rs b/gpui/src/elements/uniform_list.rs
index 74ebccdf379080beb603f1464d19a08e132154a0..04567d4223a7d12e28ab846bf97619ad36eaa4fa 100644
--- a/gpui/src/elements/uniform_list.rs
+++ b/gpui/src/elements/uniform_list.rs
@@ -1,6 +1,4 @@
-use super::{
-    AfterLayoutContext, Element, Event, EventContext, LayoutContext, PaintContext, SizeConstraint,
-};
+use super::{Element, Event, EventContext, LayoutContext, PaintContext, SizeConstraint};
 use crate::{
     geometry::{
         rect::RectF,
@@ -164,17 +162,6 @@ where
         )
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        layout: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        for item in &mut layout.items {
-            item.after_layout(cx);
-        }
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,
diff --git a/gpui/src/presenter.rs b/gpui/src/presenter.rs
index a2047a254071a745cd866232d0ecf17a4f09321d..57e40fff20a23fecd0e47970492dd15959eaaa67 100644
--- a/gpui/src/presenter.rs
+++ b/gpui/src/presenter.rs
@@ -398,15 +398,6 @@ impl Element for ChildView {
         (size, ())
     }
 
-    fn after_layout(
-        &mut self,
-        _: Vector2F,
-        _: &mut Self::LayoutState,
-        cx: &mut AfterLayoutContext,
-    ) {
-        cx.after_layout(self.view_id);
-    }
-
     fn paint(
         &mut self,
         bounds: pathfinder_geometry::rect::RectF,
diff --git a/zed/src/editor/element.rs b/zed/src/editor/element.rs
index 44b283dee1d7bf7108be123c535578b33a402560..297f04cb560e71b758c9108b130606e861d8fbf1 100644
--- a/zed/src/editor/element.rs
+++ b/zed/src/editor/element.rs
@@ -9,8 +9,8 @@ use gpui::{
     },
     json::{self, ToJson},
     text_layout::{self, TextLayoutCache},
-    AfterLayoutContext, AppContext, Border, Element, Event, EventContext, FontCache, LayoutContext,
-    MutableAppContext, PaintContext, Quad, Scene, SizeConstraint, ViewContext, WeakViewHandle,
+    AppContext, Border, Element, Event, EventContext, FontCache, LayoutContext, MutableAppContext,
+    PaintContext, Quad, Scene, SizeConstraint, ViewContext, WeakViewHandle,
 };
 use json::json;
 use smallvec::SmallVec;
@@ -552,9 +552,6 @@ impl Element for EditorElement {
         (size, Some(layout))
     }
 
-    fn after_layout(&mut self, _: Vector2F, _: &mut Self::LayoutState, _: &mut AfterLayoutContext) {
-    }
-
     fn paint(
         &mut self,
         bounds: RectF,