wip2 (205e): layout

crates/tek_layout/src/layers.rs

@@ -1,9 +1,5 @@
 use crate::*;
 
-#[macro_export] macro_rules! lay {
-    ($($expr:expr),* $(,)?) => { Layers::new(move|add|{ $(add(&$expr)?;)* Ok(()) }) }
-}
-
 pub struct Layers<
     E: Engine,
     F: Send + Sync + Fn(&mut dyn FnMut(&dyn Render<E>)->Usually<()>)->Usually<()>

crates/tek_layout/src/lib.rs

@@ -8,11 +8,47 @@ submod! {
     fixed
     grow
     inset
+    layers
     max
+    measure
     min
     outset
     pull
     push
+    scroll
     shrink
     split
+    stack
+}
+
+#[macro_export] macro_rules! lay {
+    ($($expr:expr),* $(,)?) => { Layers::new(move|add|{ $(add(&$expr)?;)* Ok(()) }) }
+}
+
+#[macro_export] macro_rules! col {
+    ($($expr:expr),* $(,)?) => { Stack::down(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
+    ($pat:pat in $collection:expr => $item:expr) => {
+        Stack::down(move |add|{
+            for $pat in $collection { add(&$item)?; }
+            Ok(())
+        })
+    }
+}
+#[macro_export] macro_rules! col_up {
+    ($($expr:expr),* $(,)?) => { Stack::down(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
+    ($pat:pat in $collection:expr => $item:expr) => {
+        Stack::up(move |add|{
+            for $pat in $collection { add(&$item)?; }
+            Ok(())
+        })
+    }
+}
+#[macro_export] macro_rules! row {
+    ($($expr:expr),* $(,)?) => { Stack::right(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
+    ($pat:pat in $collection:expr => $item:expr) => {
+        Stack::right(move |add|{
+            for $pat in $collection { add(&$item)?; }
+            Ok(())
+        })
+    }
 }

crates/tek_layout/src/max.rs

@@ -1,5 +1,7 @@
 use crate::*;
 
+impl<E: Engine, W: Render<E>> LayoutMax<E> for W {}
+
 pub trait LayoutMax<E: Engine>: Render<E> + Sized {
     fn max_x  (self, x: E::Unit) -> Max<E::Unit, Self> { Max::X(x, self) }
     fn max_y  (self, y: E::Unit) -> Max<E::Unit, Self> { Max::Y(y, self) }

crates/tek_layout/src/min.rs

@@ -1,5 +1,7 @@
 use crate::*;
 
+impl<E: Engine, W: Render<E>> LayoutMin<E> for W {}
+
 pub trait LayoutMin<E: Engine>: Render<E> + Sized {
     fn min_x  (self, x: E::Unit) -> Min<E::Unit, Self> { Min::X(x, self) }
     fn min_y  (self, y: E::Unit) -> Min<E::Unit, Self> { Min::Y(y, self) }

crates/tek_layout/src/stack.rs

@@ -1,33 +1,5 @@
 use crate::*;
 
-#[macro_export] macro_rules! col {
-    ($($expr:expr),* $(,)?) => { Stack::down(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
-    ($pat:pat in $collection:expr => $item:expr) => {
-        Stack::down(move |add|{
-            for $pat in $collection { add(&$item)?; }
-            Ok(())
-        })
-    }
-}
-#[macro_export] macro_rules! col_up {
-    ($($expr:expr),* $(,)?) => { Stack::down(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
-    ($pat:pat in $collection:expr => $item:expr) => {
-        Stack::up(move |add|{
-            for $pat in $collection { add(&$item)?; }
-            Ok(())
-        })
-    }
-}
-#[macro_export] macro_rules! row {
-    ($($expr:expr),* $(,)?) => { Stack::right(move|add|{ $(add(&$expr)?;)* Ok(()) }) };
-    ($pat:pat in $collection:expr => $item:expr) => {
-        Stack::right(move |add|{
-            for $pat in $collection { add(&$item)?; }
-            Ok(())
-        })
-    }
-}
-
 pub struct Stack<
     E: Engine,
     F: Send + Sync + Fn(&mut dyn FnMut(&dyn Render<E>)->Usually<()>)->Usually<()>