unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-10 21:56:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: now only need to remove 139x ratatui::layout::Rect

Browse source
This commit is contained in:
🪞👃🪞 2024-09-06 23:51:33 +03:00
parent ff97070a03
commit 4b92465073
6 changed files with 84 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/tek_core/src/engine/collect.rs
View file

@ -1,15 +1,24 @@
use crate::*;
pub enum Collected<'a, E: Engine> {
Box(Box<dyn Render<E> + 'a>),
Ref(&'a (dyn Render<E> + 'a)),
Box(Box<dyn Layout<E> + 'a>),
Ref(&'a (dyn Layout<E> + 'a)),
}
impl<'a, E: Engine> Render<E> for Collected<'a, E> {
fn render (&self, to: &mut E) -> Perhaps<E::Rendered> {
match self {
Self::Box(item) => (*item).render(to),
Self::Ref(item) => (*item).render(to),
Self::Box(inner) => (*inner).render(to),
Self::Ref(inner) => (*inner).render(to),
}
}
}
impl<'a, E: Engine> Layout<E> for &Collected<'a, E> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match *self {
Collected::Box(inner) => (*inner).layout(area),
Collected::Ref(inner) => (*inner).layout(area),
}
}
}
@ -25,9 +34,9 @@ impl<'a, E: Engine> Collection<'a, E> {
}
pub trait Collect<'a, E: Engine> {
fn add_box (self, item: Box<dyn Render<E> + 'a>) -> Self;
fn add_ref (self, item: &'a dyn Render<E>) -> Self;
fn add <R: Render<E> + Sized + 'a> (self, item: R) -> Self
fn add_box (self, item: Box<dyn Layout<E> + 'a>) -> Self;
fn add_ref (self, item: &'a dyn Layout<E>) -> Self;
fn add <R: Layout<E> + Sized + 'a> (self, item: R) -> Self
where Self: Sized
{
self.add_box(Box::new(item))
@ -35,11 +44,11 @@ pub trait Collect<'a, E: Engine> {
}
impl<'a, E: Engine> Collect<'a, E> for Collection<'a, E> {
fn add_box (mut self, item: Box<dyn Render<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
self.0.push(Collected::Box(item));
self
}
fn add_ref (mut self, item: &'a dyn Render<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
self.0.push(Collected::Ref(item));
self
}
@ -54,11 +63,11 @@ impl<'a, E: Engine> Layered<'a, E> {
}
impl<'a, E: Engine> Collect<'a, E> for Layered<'a, E> {
fn add_box (mut self, item: Box<dyn Render<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
self.0 = self.0.add_box(item);
self
}
fn add_ref (mut self, item: &'a dyn Render<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
self.0 = self.0.add_ref(item);
self
}
@ -103,11 +112,11 @@ impl<'a, E: Engine> Split<'a, E> {
}
impl<'a, E: Engine> Collect<'a, E> for Split<'a, E> {
fn add_box (mut self, item: Box<dyn Render<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
self.items = self.items.add_box(item);
self
}
fn add_ref (mut self, item: &'a dyn Render<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
self.items = self.items.add_ref(item);
self
}

42
crates/tek_core/src/engine/layout.rs
View file

@ -2,7 +2,7 @@ use crate::*;
/// Trait for structs that compute drawing area before rendering
pub trait Layout<E: Engine>: Render<E> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>>;
fn layout (&self, area: E::Area) -> Perhaps<E::Area>;
}
/// Enforce minimum size of drawing area
pub enum Min<U: Number, L> { W(U, L), H(U, L), WH(U, U, L), }
@ -16,84 +16,84 @@ pub enum Inset<U: Number, L> { W(U, L), H(U, L), WH(U, U, L), }
pub enum Offset<U: Number, L> { X(U, L), Y(U, L), XY(U, U, L), }
impl<E: Engine, L: Layout<E>> Layout<E> for Min<E:: Unit, L> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::W(w, item) => if area.w() < *w { Ok(None) } else {
// TODO: axis clamp (subtract from x if width goes out of area
item.layout([area.x(), area.y(), area.w().max(*w), area.h()])
item.layout([area.x(), area.y(), area.w().max(*w), area.h()].into())
},
Self::H(h, item) => if area.w() < *h { Ok(None) } else {
// TODO: axis clamp (subtract from x if width goes out of area
item.layout([area.x(), area.y(), area.w(), area.h().max(*h)])
item.layout([area.x(), area.y(), area.w(), area.h().max(*h)].into())
},
Self::WH(w, h, item) => if area.w() < *w || area.h() < *h { Ok(None) } else {
item.layout([area.x(), area.y(), area.w().max(*w), area.h().max(*h)])
item.layout([area.x(), area.y(), area.w().max(*w), area.h().max(*h)].into())
}
}
}
}
impl<E: Engine, L: Layout<E>> Layout<E> for Max<E:: Unit, L> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::W(w, item) => {
// TODO: axis clamp (subtract from x if width goes out of area
item.layout([area.x(), area.y(), area.w().min(*w), area.h()])
item.layout([area.x(), area.y(), area.w().min(*w), area.h()].into())
},
Self::H(h, item) => {
// TODO: axis clamp (subtract from x if width goes out of area
item.layout([area.x(), area.y(), area.w(), area.h().min(*h)])
item.layout([area.x(), area.y(), area.w(), area.h().min(*h)].into())
},
Self::WH(w, h, item) => {
item.layout([area.x(), area.y(), area.w().min(*w), area.h().min(*h)])
item.layout([area.x(), area.y(), area.w().min(*w), area.h().min(*h)].into())
}
}
}
}
impl<E: Engine, L: Layout<E>> Layout<E> for Outset<E::Unit, L> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::W(w, item) => if area.x() < *w { Ok(None) } else {
item.layout([area.x() - *w, area.y(), area.w() + *w, area.h()])
item.layout([area.x() - *w, area.y(), area.w() + *w, area.h()].into())
},
Self::H(h, item) => if area.y() < *h { Ok(None) } else {
item.layout([area.x(), area.y() - *h, area.w(), area.h() + *h])
item.layout([area.x(), area.y() - *h, area.w(), area.h() + *h].into())
},
Self::WH(w, h, item) => if area.x() < *w || area.y() < *h { Ok(None) } else {
item.layout([area.x()-*w, area.y() - *h, area.w() + *w, area.h() + *h])
item.layout([area.x()-*w, area.y() - *h, area.w() + *w, area.h() + *h].into())
}
}
}
}
impl<E: Engine, L: Layout<E>> Layout<E> for Inset<E::Unit, L> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::W(w, item) => if area.w() < *w { Ok(None) } else {
item.layout([area.x() + *w, area.y(), area.w() - *w, area.h()])
item.layout([area.x() + *w, area.y(), area.w() - *w, area.h()].into())
},
Self::H(h, item) => if area.h() < *h { Ok(None) } else {
item.layout([area.x(), area.y() + *h, area.w(), area.h() - *h])
item.layout([area.x(), area.y() + *h, area.w(), area.h() - *h].into())
},
Self::WH(w, h, item) => if area.w() < *w || area.h() < *h { Ok(None) } else {
item.layout([area.x() - *w, area.y() - *h, area.w() + *w, area.h() + *h])
item.layout([area.x() - *w, area.y() - *h, area.w() + *w, area.h() + *h].into())
}
}
}
}
impl<E: Engine, L: Layout<E>> Layout<E> for Offset<E::Unit, L> {
fn layout (&self, area: impl Rectangle<E::Unit>) -> Perhaps<impl Rectangle<E::Unit>> {
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::X(x, item) => if area.w() < *x { Ok(None) } else {
item.layout([area.x() + *x, area.y(), area.w() - *x, area.h()])
item.layout([area.x() + *x, area.y(), area.w() - *x, area.h()].into())
},
Self::Y(y, item) => if area.h() < *y { Ok(None) } else {
item.layout([area.x(), area.y() + *y, area.w(), area.h() - *y])
item.layout([area.x(), area.y() + *y, area.w(), area.h() - *y].into())
},
Self::XY(x, y, item) => if area.w() < *x || area.h() < *y { Ok(None) } else {
item.layout([area.x() + *x, area.y() + *y, area.w() - *x, area.h() - *y])
item.layout([area.x() + *x, area.y() + *y, area.w() - *x, area.h() - *y].into())
}
}
}