diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs index 990dcd4591..8d2ac9c83d 100644 --- a/crates/gpui2/src/app.rs +++ b/crates/gpui2/src/app.rs @@ -614,7 +614,7 @@ impl AppContext { }) .collect::>() { - self.update_window(window, |_, cx| cx.draw()).ok(); + self.update_window(window, |_, cx| cx.draw()).unwrap(); } } diff --git a/crates/gpui2/src/platform/test/platform.rs b/crates/gpui2/src/platform/test/platform.rs index 2a57842991..8997eb4902 100644 --- a/crates/gpui2/src/platform/test/platform.rs +++ b/crates/gpui2/src/platform/test/platform.rs @@ -136,12 +136,11 @@ impl Platform for TestPlatform { &self, handle: AnyWindowHandle, options: WindowOptions, - draw: Box Result>, + _draw: Box Result>, ) -> Box { *self.active_window.lock() = Some(handle); Box::new(TestWindow::new( options, - draw, self.weak.clone(), self.active_display.clone(), )) diff --git a/crates/gpui2/src/platform/test/window.rs b/crates/gpui2/src/platform/test/window.rs index a99629b07a..5af990514f 100644 --- a/crates/gpui2/src/platform/test/window.rs +++ b/crates/gpui2/src/platform/test/window.rs @@ -1,5 +1,5 @@ use crate::{ - px, AtlasKey, AtlasTextureId, AtlasTile, DrawWindow, Pixels, PlatformAtlas, PlatformDisplay, + px, AtlasKey, AtlasTextureId, AtlasTile, Pixels, PlatformAtlas, PlatformDisplay, PlatformInputHandler, PlatformWindow, Point, Size, TestPlatform, TileId, WindowAppearance, WindowBounds, WindowOptions, }; @@ -20,7 +20,6 @@ pub(crate) struct TestWindowHandlers { pub struct TestWindow { pub(crate) bounds: WindowBounds, - draw: Mutex, display: Rc, pub(crate) window_title: Option, pub(crate) input_handler: Option>>>, @@ -32,13 +31,11 @@ pub struct TestWindow { impl TestWindow { pub fn new( options: WindowOptions, - draw: DrawWindow, platform: Weak, display: Rc, ) -> Self { Self { bounds: options.bounds, - draw: Mutex::new(draw), display, platform, input_handler: None,