diff --git a/crates/tek/src/core/output.rs b/crates/tek/src/core/output.rs index 11871962..9b2ea0ff 100644 --- a/crates/tek/src/core/output.rs +++ b/crates/tek/src/core/output.rs @@ -15,39 +15,6 @@ pub fn widget > (w: &T) -> &dyn Render { w as &dyn Render } -/// A [Render] that contains other [Render]s -pub trait Content: Send + Sync { - fn content (&self) -> impl Render; -} - -//impl> Render for &C { - //fn min_size (&self, to: E::Size) -> Perhaps { - //self.content().min_size(to) - //} - //fn render (&self, to: &mut E::Output) -> Usually<()> { - //match self.min_size(to.area().wh().into())? { - //Some(wh) => to.render_in(to.area().clip(wh).into(), &self.content()), - //None => Ok(()) - //} - //} -//} - -/* - -/// Every struct that has [Content] is a renderable [Render]. -impl> Render for C { - fn min_size (&self, to: E::Size) -> Perhaps { - self.content().min_size(to) - } - fn render (&self, to: &mut E::Output) -> Usually<()> { - match self.min_size(to.area().wh().into())? { - Some(wh) => to.render_in(to.area().clip(wh).into(), &self.content()), - None => Ok(()) - } - } -} -*/ - /// A renderable component pub trait Render: Send + Sync { /// Minimum size to use diff --git a/crates/tek/src/layout/bsp.rs b/crates/tek/src/layout/bsp.rs index 8353c1f9..ad522e6e 100644 --- a/crates/tek/src/layout/bsp.rs +++ b/crates/tek/src/layout/bsp.rs @@ -42,109 +42,3 @@ impl, Y: Render> Default for Bsp { Self::Null(Default::default()) } } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -//impl LayoutBspStatic for E {} - -//pub trait LayoutBspStatic: { - //fn n , B: Render> (a: A, b: B) -> ToNorth { - //ToNorth(None, a, b) - //} - //fn s , B: Render> (a: A, b: B) -> ToSouth { - //ToSouth(None, a, b) - //} - //fn e , B: Render> (a: A, b: B) -> ToEast { - //ToEast(None, a, b) - //} - //fn w , B: Render> (a: A, b: B) -> ToWest { - //ToWest(None, a, b) - //} - //fn i , B: Render> (a: A, b: B) -> Over { - //Over(Default::default(), a, b) - //} - //fn o , B: Render> (a: A, b: B) -> Under { - //Under(Default::default(), a, b) - //} -//} - -//pub trait LayoutBspFixedStatic: { - //fn to_north , B: Render> (n: E::Unit, a: A, b: B) -> ToNorth { - //ToNorth(Some(n), a, b) - //} - //fn to_south , B: Render> (n: E::Unit, a: A, b: B) -> ToSouth { - //ToSouth(Some(n), a, b) - //} - //fn to_east , B: Render> (n: E::Unit, a: A, b: B) -> ToEast { - //ToEast(Some(n), a, b) - //} - //fn to_west , B: Render> (n: E::Unit, a: A, b: B) -> ToWest { - //ToWest(Some(n), a, b) - //} -//} - -//pub struct Over, B: Render>(PhantomData, A, B); - -//pub struct Under, B: Render>(PhantomData, A, B); - -//pub struct ToNorth, B: Render>(Option, A, B); - -//pub struct ToSouth, B: Render>(Option, A, B); - -//pub struct ToEast(Option, A, B); - -//pub struct ToWest, B: Render>(Option, A, B); - -//impl, B: Render> Render for Over { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//} - -//impl, B: Render> Render for Under { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//} - -//impl, B: Render> Render for ToNorth { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//} - -//impl, B: Render> Render for ToSouth { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//} - -//impl, B: Render> Render for ToWest { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//} - -//impl, B: Render> Render for ToEast { - //fn min_size (&self, _: E::Size) -> Perhaps { - //todo!(); - //} - //fn render (&self, _: &mut E::Output) -> Usually<()> { - //Ok(()) - //} -//}