WIP: Everything shredded

crates/gpui/src/elements/hook.rs

@@ -3,17 +3,16 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    window::MeasurementContext,
-    DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
+    Element, ElementBox, SceneBuilder, SizeConstraint, View, ViewContext,
 };
 
-pub struct Hook {
-    child: ElementBox,
-    after_layout: Option<Box<dyn FnMut(Vector2F, &mut LayoutContext)>>,
+pub struct Hook<V: View> {
+    child: ElementBox<V>,
+    after_layout: Option<Box<dyn FnMut(Vector2F, &mut ViewContext<V>)>>,
 }
 
-impl Hook {
-    pub fn new(child: ElementBox) -> Self {
+impl<V: View> Hook<V> {
+    pub fn new(child: ElementBox<V>) -> Self {
         Self {
             child,
             after_layout: None,
@@ -22,23 +21,24 @@ impl Hook {
 
     pub fn on_after_layout(
         mut self,
-        f: impl 'static + FnMut(Vector2F, &mut LayoutContext),
+        f: impl 'static + FnMut(Vector2F, &mut ViewContext<V>),
     ) -> Self {
         self.after_layout = Some(Box::new(f));
         self
     }
 }
 
-impl Element for Hook {
+impl<V: View> Element<V> for Hook<V> {
     type LayoutState = ();
     type PaintState = ();
 
     fn layout(
         &mut self,
         constraint: SizeConstraint,
-        cx: &mut LayoutContext,
+        view: &V,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
-        let size = self.child.layout(constraint, cx);
+        let size = self.child.layout(constraint, view, cx);
         if let Some(handler) = self.after_layout.as_mut() {
             handler(size, cx);
         }
@@ -47,12 +47,15 @@ impl Element for Hook {
 
     fn paint(
         &mut self,
+        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
-        cx: &mut PaintContext,
+        view: &mut V,
+        cx: &mut ViewContext<V>,
     ) {
-        self.child.paint(bounds.origin(), visible_bounds, cx);
+        self.child
+            .paint(scene, bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
@@ -62,9 +65,10 @@ impl Element for Hook {
         _: RectF,
         _: &Self::LayoutState,
         _: &Self::PaintState,
-        cx: &MeasurementContext,
+        view: &V,
+        cx: &ViewContext<V>,
     ) -> Option<RectF> {
-        self.child.rect_for_text_range(range_utf16, cx)
+        self.child.rect_for_text_range(range_utf16, view, cx)
     }
 
     fn debug(
@@ -72,11 +76,12 @@ impl Element for Hook {
         _: RectF,
         _: &Self::LayoutState,
         _: &Self::PaintState,
-        cx: &DebugContext,
+        view: &V,
+        cx: &ViewContext<V>,
     ) -> serde_json::Value {
         json!({
             "type": "Hooks",
-            "child": self.child.debug(cx),
+            "child": self.child.debug(view, cx),
         })
     }
 }