Skip to content

Commit

Permalink
chore: buggy changes
Browse files Browse the repository at this point in the history
  • Loading branch information
marc2332 committed Aug 6, 2024
1 parent d833659 commit 7299493
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions crates/torin/src/torin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,6 @@ impl<Key: NodeKey> Torin<Key> {
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();

Expand All @@ -264,12 +255,14 @@ impl<Key: NodeKey> Torin<Key> {

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);
}

Expand Down

0 comments on commit 7299493

Please sign in to comment.