unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-09 05:06:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test and fix behaviors of some of the layout components

Browse source
This commit is contained in:
🪞👃🪞 2024-09-12 17:05:08 +03:00
parent aaedede796
commit 11ecf669a1
4 changed files with 137 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

103
crates/tek_core/src/engine.rs
View file

@ -453,11 +453,11 @@ impl<E: Engine, T: Widget<Engine = E>> Widget for Min<E::Unit, T> {
}
fn render (&self, to: &mut E) -> Perhaps<E::Area> {
// 🡘 🡙 ←🡙→
self.layout(to.area())?
.map(|area|to.with_area(area.x(), area.y(), area.w(), area.h()))
.map(|to|self.inner().render(to))
.transpose()
.map(|x|x.flatten())
if let Some(area) = self.layout(to.area())? {
to.render_in(area, self.inner())
} else {
Ok(None)
}
}
}
@ -499,11 +499,11 @@ impl<E: Engine, T: Widget<Engine = E>> Widget for Max<E:: Unit, T> {
}
}
fn render (&self, to: &mut E) -> Perhaps<E::Area> {
self.layout(to.area())?
.map(|area|to.with_area(area.x(), area.y(), area.w(), area.h()))
.map(|to|self.inner().render(to))
.transpose()
.map(|x|x.flatten())
if let Some(area) = self.layout(to.area())? {
to.render_in(area, self.inner())
} else {
Ok(None)
}
}
}
@ -530,24 +530,30 @@ impl<N: Number, T> Outset<N, T> {
impl<E: Engine, T: Widget<Engine = E>> Widget for Outset<E::Unit, T> {
type Engine = E;
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()].into())
Ok(match self {
Self::W(w, item) => if area.x() < *w { None } else {
item.layout(area)?.map(|area|[
area.x() - *w, area.y(), area.w() + *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].into())
Self::H(h, item) => if area.y() < *h { None } else {
item.layout(area)?.map(|area|[
area.x(), area.y() - *h, area.w(), area.h() + *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].into())
Self::WH(w, h, item) => if area.x() < *w || area.y() < *h { None } else {
item.layout(area)?.map(|area|[
area.x()- *w, area.y() - *h, area.w() + *w + *w, area.h() + *h + *h
].into())
}
}
})
}
fn render (&self, to: &mut E) -> Perhaps<E::Area> {
self.layout(to.area())?
.map(|area|to.with_area(area.x(), area.y(), area.w(), area.h()))
.map(|to|self.inner().render(to))
.transpose()
.map(|x|x.flatten())
if let Some(area) = self.layout(to.area())? {
to.render_in(area, self.inner())
} else {
Ok(None)
}
}
}
@ -574,24 +580,30 @@ impl<N: Number, T: Widget> Inset<N, T> {
impl<E: Engine, T: Widget<Engine = E>> Widget for Inset<E::Unit, T> {
type Engine = E;
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()].into())
Ok(match self {
Self::W(w, item) => if area.w() < *w { None } else {
item.layout(area)?.map(|area|[
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].into())
Self::H(h, item) => if area.h() < *h { None } else {
item.layout(area)?.map(|area|[
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].into())
Self::WH(w, h, item) => if area.w() < *w || area.h() < *h { None } else {
item.layout(area)?.map(|area|[
area.x() - *w, area.y() - *h, area.w() + *w, area.h() + *h
].into())
}
}
})
}
fn render (&self, to: &mut E) -> Perhaps<E::Area> {
self.layout(to.area())?
.map(|area|to.with_area(area.x(), area.y(), area.w(), area.h()))
.map(|to|self.inner().render(to))
.transpose()
.map(|x|x.flatten())
if let Some(area) = self.layout(to.area())? {
to.render_in(area, self.inner())
} else {
Ok(None)
}
}
}
@ -617,22 +629,25 @@ impl<E: Engine, T: Widget<Engine = E>> Widget for Offset<E::Unit, T> {
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()].into())
let offset_area = [area.x() + *x, area.y(), area.w() - *x, area.h()];
item.layout(offset_area.into())
},
Self::Y(y, item) => if area.h() < *y { Ok(None) } else {
item.layout([area.x(), area.y() + *y, area.w(), area.h() - *y].into())
let offset_area = [area.x(), area.y() + *y, area.w(), area.h() - *y];
item.layout(offset_area.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].into())
let offset_area = [area.x() + *x, area.y() + *y, area.w() - *x, area.h() - *y];
item.layout(offset_area.into())
}
}
}
fn render (&self, to: &mut E) -> Perhaps<E::Area> {
self.layout(to.area())?
.map(|area|to.with_area(area.x(), area.y(), area.w(), area.h()))
.map(|to|self.inner().render(to))
.transpose()
.map(|x|x.flatten())
if let Some(area) = self.layout(to.area())? {
to.render_in(area, self.inner())
} else {
Ok(None)
}
}
}