Fix for child-space issue (#32)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "morphorm"
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 author = "George Atkinson <geom3trik@vizia.dev>"
 license = "MIT"

ecs/Cargo.toml

@@ -6,7 +6,7 @@ description = "A mini ECS used for testing the morphorm crate."
 license = "MIT"
 
 [dependencies]
-morphorm = {version = "0.6.3", path = "../"}
+morphorm = {version = "0.6.4", path = "../"}
 femtovg = {version = "0.7.1", default-features = false}
 rand = "0.8.5"
 slotmap = "1.0.6"

src/layout.rs

@@ -200,17 +200,17 @@ where
     let mut iter = node
         .children(tree)
         .filter(|child| child.visible(store))
-        .enumerate()
-        .filter(|(_, child)| child.position_type(store).unwrap_or_default() == PositionType::ParentDirected);
+        .filter(|child| child.position_type(store).unwrap_or_default() == PositionType::ParentDirected)
+        .enumerate();
 
     let first = iter.next().map(|(index, _)| index);
     let last = iter.last().map_or(first, |(index, _)| Some(index));
 
     let mut node_children = node
         .children(tree)
         .filter(|child| child.visible(store))
+        .filter(|child| child.position_type(store).unwrap_or_default() == PositionType::ParentDirected)
         .enumerate()
-        .filter(|(_, child)| child.position_type(store).unwrap_or_default() == PositionType::ParentDirected)
         .peekable();
 
     // Compute space and size of non-flexible parent-directed children.
@@ -353,9 +353,9 @@ where
     // Compute flexible space and size on the cross-axis for parent-directed children.
     for (index, child) in children
         .iter_mut()
+        .filter(|child| child.node.position_type(store).unwrap_or_default() == PositionType::ParentDirected)
+        .filter(|child| !child.node.cross(store, layout_type).is_auto())
         .enumerate()
-        .filter(|(_, child)| child.node.position_type(store).unwrap_or_default() == PositionType::ParentDirected)
-        .filter(|(_, child)| !child.node.cross(store, layout_type).is_auto())
     {
         let mut child_cross_before = child.node.cross_before(store, layout_type);
         let child_cross = child.node.cross(store, layout_type);
@@ -570,8 +570,7 @@ where
 
     // Compute stretch cross_before and stretch cross_after for auto cross children.
     // TODO: I think this only needs to be done for parent-directed children...
-    for (index, child) in
-        children.iter_mut().enumerate().filter(|(_, child)| child.node.cross(store, layout_type).is_auto())
+    for (index, child) in children.iter_mut().filter(|child| child.node.cross(store, layout_type).is_auto()).enumerate()
     {
         let mut child_cross_before = child.node.cross_before(store, layout_type);
         let mut child_cross_after = child.node.cross_after(store, layout_type);
@@ -782,8 +781,8 @@ where
     // Compute flexible space and size on the cross-axis for self-directed nodes.
     for (index, child) in children
         .iter_mut()
+        .filter(|child| child.node.position_type(store).unwrap_or_default() == PositionType::SelfDirected)
         .enumerate()
-        .filter(|(_, child)| child.node.position_type(store).unwrap_or_default() == PositionType::SelfDirected)
     {
         let mut child_cross_before = child.node.cross_before(store, layout_type);
         let child_cross = child.node.cross(store, layout_type);
@@ -933,8 +932,8 @@ where
     // Compute flexible space and size on the main-axis for self-directed nodes.
     for (index, child) in children
         .iter_mut()
+        .filter(|child| child.node.position_type(store).unwrap_or_default() == PositionType::SelfDirected)
         .enumerate()
-        .filter(|(_, child)| child.node.position_type(store).unwrap_or_default() == PositionType::SelfDirected)
     {
         let mut child_main_before = child.node.main_before(store, layout_type);
         let child_main = child.node.main(store, layout_type);