diff --git a/crates/torin/src/torin.rs b/crates/torin/src/torin.rs index a0c1c48e6..cf8acbe75 100644 --- a/crates/torin/src/torin.rs +++ b/crates/torin/src/torin.rs @@ -243,15 +243,6 @@ impl Torin { suggested_root_id }; let root_parent_id = dom_adapter.parent_of(&root_id); - let layout_node = root_parent_id - .and_then(|root_parent_id| self.get(root_parent_id).cloned()) - .unwrap_or(LayoutNode { - area: root_area, - inner_size: root_area.size, - inner_sizes: Size2D::default(), - margin: None, - data: None, - }); let root = dom_adapter.get_node(&root_id).unwrap(); let root_height = dom_adapter.height(&root_id).unwrap(); @@ -264,12 +255,14 @@ impl Torin { let layout_metadata = LayoutMetadata { root_area }; - let inner_area = Area::new(layout_node.area.origin, layout_node.inner_size) - .without_gaps(&root.padding) - .without_gaps(&root.margin); + let mut inner_area = Area::new(root_area.origin, root_area.size); let mut available_area = inner_area; if let Some(root_parent_id) = root_parent_id { let root_parent = dom_adapter.get_node(&root_parent_id).unwrap(); + inner_area = root_area + .without_gaps(&root_parent.padding) + .without_gaps(&root_parent.margin); + available_area = inner_area; available_area.move_with_offsets(&root_parent.offset_x, &root_parent.offset_y); }