diff --git a/crates/gpui3/src/elements/div.rs b/crates/gpui3/src/elements/div.rs index 41874d9e89f9c25bdcc7e42789161a8c5153c291..03229dc1da5d6a3fbb42c8a695f48b16b1b65a75 100644 --- a/crates/gpui3/src/elements/div.rs +++ b/crates/gpui3/src/elements/div.rs @@ -61,7 +61,7 @@ where let child_layout_ids = style.apply_text_style(cx, |cx| { self.with_element_id(cx, |this, cx| this.layout_children(view, cx)) }); - let layout_id = cx.request_layout(style.into(), child_layout_ids.clone()); + let layout_id = cx.request_layout(&style, child_layout_ids.clone()); (layout_id, ()) } diff --git a/crates/gpui3/src/elements/img.rs b/crates/gpui3/src/elements/img.rs index 8709707f319e8b947af5f91a5cf1364c94798f9d..a8e65fa0ff6c326125b5d52ed937f9fb533fde1b 100644 --- a/crates/gpui3/src/elements/img.rs +++ b/crates/gpui3/src/elements/img.rs @@ -62,7 +62,7 @@ impl Element for Img { Self: Sized, { let style = self.computed_style(); - let layout_id = cx.request_layout(style, []); + let layout_id = cx.request_layout(&style, []); (layout_id, ()) } diff --git a/crates/gpui3/src/elements/nested.rs b/crates/gpui3/src/elements/nested.rs index 532654958a9724f3ea2b25758fbe70020393232e..297460f320feb081745907e0ac93a5910472a33e 100644 --- a/crates/gpui3/src/elements/nested.rs +++ b/crates/gpui3/src/elements/nested.rs @@ -134,7 +134,7 @@ impl Element for LayoutNodeElement>(); - let style = this.computed_style().clone(); + let style = this.computed_style(); let layout_id = cx.request_layout(style, layout_ids); (layout_id, ()) }) diff --git a/crates/gpui3/src/elements/svg.rs b/crates/gpui3/src/elements/svg.rs index cd11c927514370786df6bcc9bb93c1bfad59bff9..c81eff7aa9a3642a5b59e7a08792883ecbfc7e2c 100644 --- a/crates/gpui3/src/elements/svg.rs +++ b/crates/gpui3/src/elements/svg.rs @@ -53,7 +53,7 @@ impl Element for Svg { Self: Sized, { let style = self.computed_style(); - (cx.request_layout(style, []), ()) + (cx.request_layout(&style, []), ()) } fn paint( diff --git a/crates/gpui3/src/taffy.rs b/crates/gpui3/src/taffy.rs index cadb7e1b57bff164c2e63ea41b5d5aa2edb05fe4..71844bb8a631bb0820ebbcadaf8e4131aef0eeb3 100644 --- a/crates/gpui3/src/taffy.rs +++ b/crates/gpui3/src/taffy.rs @@ -28,7 +28,7 @@ impl TaffyLayoutEngine { pub fn request_layout( &mut self, - style: Style, + style: &Style, rem_size: Pixels, children: &[LayoutId], ) -> LayoutId { diff --git a/crates/gpui3/src/window.rs b/crates/gpui3/src/window.rs index b57f152f2103813810a977850b231dd1eb967d77..fa52941ead8b4172a08b2a0b80ac95c4f70407ca 100644 --- a/crates/gpui3/src/window.rs +++ b/crates/gpui3/src/window.rs @@ -248,7 +248,7 @@ impl<'a, 'w> WindowContext<'a, 'w> { pub fn request_layout( &mut self, - style: Style, + style: &Style, children: impl IntoIterator, ) -> LayoutId { self.app.layout_id_buffer.clear();