WIP

crates/gpui/src/elements/align.rs

@@ -1,7 +1,7 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 use json::ToJson;

crates/gpui/src/elements/canvas.rs

@@ -1,7 +1,7 @@
 use super::Element;
 use crate::{
     json::{self, json},
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, PaintContext,
 };
 use json::ToJson;

crates/gpui/src/elements/constrained_box.rs

@@ -6,7 +6,7 @@ use serde_json::json;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 

crates/gpui/src/elements/container.rs

@@ -9,8 +9,8 @@ use crate::{
     },
     json::ToJson,
     platform::CursorStyle,
-    presenter::MeasurementContext,
     scene::{self, Border, CursorRegion, Quad},
+    window::MeasurementContext,
     Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 use serde::Deserialize;

crates/gpui/src/elements/empty.rs

@@ -6,7 +6,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext,
 };
 use crate::{Element, LayoutContext, PaintContext, SizeConstraint};

crates/gpui/src/elements/expanded.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 use serde_json::json;

crates/gpui/src/elements/flex.rs

@@ -2,7 +2,7 @@ use std::{any::Any, cell::Cell, f32::INFINITY, ops::Range, rc::Rc};
 
 use crate::{
     json::{self, ToJson, Value},
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     Axis, DebugContext, Element, ElementBox, ElementStateHandle, LayoutContext, PaintContext,
     RenderContext, SizeConstraint, Vector2FExt, View,
 };

crates/gpui/src/elements/hook.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 

crates/gpui/src/elements/image.rs

@@ -5,8 +5,9 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    presenter::MeasurementContext,
-    scene, Border, DebugContext, Element, ImageData, LayoutContext, PaintContext, SizeConstraint,
+    scene,
+    window::MeasurementContext,
+    Border, DebugContext, Element, ImageData, LayoutContext, PaintContext, SizeConstraint,
 };
 use serde::Deserialize;
 use std::{ops::Range, sync::Arc};

crates/gpui/src/elements/label.rs

@@ -7,8 +7,8 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{ToJson, Value},
-    presenter::MeasurementContext,
     text_layout::{Line, RunStyle},
+    window::MeasurementContext,
     DebugContext, Element, LayoutContext, PaintContext, SizeConstraint,
 };
 use serde::Deserialize;

crates/gpui/src/elements/list.rs

@@ -4,7 +4,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, ElementRc, EventContext, LayoutContext, MouseRegion,
     PaintContext, RenderContext, SizeConstraint, View, ViewContext,
 };
@@ -631,7 +631,6 @@ mod tests {
 
     #[crate::test(self)]
     fn test_layout(cx: &mut crate::AppContext) {
-        let mut presenter = cx.build_presenter(0, 0., Default::default());
         let (_, view) = cx.add_window(Default::default(), |_| TestView);
         let constraint = SizeConstraint::new(vec2f(0., 0.), vec2f(100., 40.));
 
@@ -730,8 +729,7 @@ mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(10);
 
-        let (_, view) = cx.add_window(Default::default(), |_| TestView);
-        let mut presenter = cx.build_presenter(0, 0., Default::default());
+        let (window_id, view) = cx.add_window(Default::default(), |_| TestView);
         let mut next_id = 0;
         let elements = Rc::new(RefCell::new(
             (0..rng.gen_range(0..=20))

crates/gpui/src/elements/overlay.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::ToJson,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     Axis, DebugContext, Element, ElementBox, LayoutContext, MouseRegion, PaintContext,
     SizeConstraint,
 };

crates/gpui/src/elements/stack.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     DebugContext, Element, ElementBox, LayoutContext, PaintContext, SizeConstraint,
 };
 

crates/gpui/src/elements/svg.rs

@@ -8,8 +8,9 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    presenter::MeasurementContext,
-    scene, DebugContext, Element, LayoutContext, PaintContext, SizeConstraint,
+    scene,
+    window::MeasurementContext,
+    DebugContext, Element, LayoutContext, PaintContext, SizeConstraint,
 };
 
 pub struct Svg {

crates/gpui/src/elements/text.rs

@@ -6,8 +6,8 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{ToJson, Value},
-    presenter::MeasurementContext,
     text_layout::{Line, RunStyle, ShapedBoundary},
+    window::MeasurementContext,
     DebugContext, Element, FontCache, LayoutContext, PaintContext, SizeConstraint, TextLayoutCache,
 };
 use log::warn;
@@ -271,12 +271,18 @@ pub fn layout_highlighted_chunks<'a>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{elements::Empty, fonts, AppContext, ElementBox, Entity, RenderContext, View};
+    use crate::{
+        elements::Empty, fonts, platform, AppContext, ElementBox, Entity, RenderContext, View,
+    };
 
     #[crate::test(self)]
     fn test_soft_wrapping_with_carriage_returns(cx: &mut AppContext) {
-        let (window_id, _) = cx.add_window(Default::default(), |_| TestView);
-        let mut presenter = cx.build_presenter(window_id, Default::default(), Default::default());
+        let (window_id, root_view) = cx.add_window(Default::default(), |_| TestView);
+        let mut presenter = cx.build_window(
+            window_id,
+            root_view.into_any(),
+            Box::new(platform::test::Window::new(Vector2F::new(800., 600.))),
+        );
         fonts::with_font_cache(cx.font_cache().clone(), || {
             let mut text = Text::new("Hello\r\n", Default::default()).with_soft_wrap(true);
             let (_, state) = text.layout(

crates/gpui/src/elements/tooltip.rs

@@ -6,7 +6,7 @@ use crate::{
     fonts::TextStyle,
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    presenter::MeasurementContext,
+    window::MeasurementContext,
     Action, Axis, ElementStateHandle, LayoutContext, PaintContext, RenderContext, SizeConstraint,
     Task, View,
 };

crates/gpui/src/elements/uniform_list.rs

@@ -6,8 +6,8 @@ use crate::{
     },
     json::{self, json},
     platform::ScrollWheelEvent,
-    presenter::MeasurementContext,
     scene::MouseScrollWheel,
+    window::MeasurementContext,
     ElementBox, MouseRegion, RenderContext, View,
 };
 use json::ToJson;