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

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

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