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

wip: fixing Map, centering

Browse source
This commit is contained in:
🪞👃🪞 2025-01-01 17:00:28 +01:00
parent 059ff2ca79
commit d17d20e7db
10 changed files with 104 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

14
layout/src/align.rs
View file

@ -29,13 +29,13 @@ impl<E: Engine, T: Content<E>> Content<E> for Align<E, T> {
}
pub fn align_areas<N: Coordinate>(alignment: Alignment, on: [N;4], it: [N;4]) -> [N;4] {
let [cfx, cfy] = on.center();
let [cmx, cmy] = it.center();
let center = |cf, cm, m: N|if cf >= cm { m + (cf - cm) } else { m.minus(cm - cf) };
let center_x = center(cfx, cmx, it.x());
let center_y = center(cfy, cmy, it.y());
let east_x = on.x() + on.w().minus(it.w());
let south_y = on.y() + on.h().minus(it.h());
let [cfx, cfy, ..] = on.center();
let [cmx, cmy, ..] = it.center();
let center = |cf, cm, m: N|if cf >= cm { m + (cf - cm) } else { m.minus(cm - cf) };
let center_x = center(cfx, cmx, it.x());
let center_y = center(cfy, cmy, it.y());
let east_x = on.x() + on.w().minus(it.w());
let south_y = on.y() + on.h().minus(it.h());
let [x, y] = match alignment {
Alignment::Center => [center_x, center_y,],

10
layout/src/lib.rs
View file

@ -13,11 +13,13 @@ pub(crate) use ::tek_engine::*;
pub(crate) use std::marker::PhantomData;
#[cfg(test)] #[test] fn test_layout () -> Usually<()> {
use crate::tui::Tui;
let area: [u16;4] = [10, 10, 20, 20];
let unit = ();
//assert_eq!(().layout(area), [15, 15, 0, 0]); // should be independent over E, isn't
assert_eq!(Fill::x(()).layout(area), [10, 15, 20, 0]);
assert_eq!(Fill::y(()).layout(area), [15, 10, 0, 20]);
assert_eq!(Fill::xy(()).layout(area), area);
// should be independent over E, isn't
assert_eq!(Content::<Tui>::layout(&unit, area), [15, 15, 0, 0]);
assert_eq!(Fill::<Tui, _>::x(unit).layout(area), [10, 15, 20, 0]);
assert_eq!(Fill::<Tui, _>::y(unit).layout(area), [15, 10, 0, 20]);
assert_eq!(Fill::<Tui, _>::xy(unit).layout(area), area);
Ok(())
}

29
layout/src/ops.rs
View file

@ -21,13 +21,14 @@ pub trait Layout<E: Engine> {
{
Opt(option, cb, Default::default())
}
fn map <T, I, R, F>(iterator: I, callback: F) -> Map<E, T, I, R, F> where
fn map <T, I, J, R, F>(iterator: J, callback: F) -> Map<E, T, I, J, R, F> where
E: Engine,
I: Iterator<Item = T> + Send + Sync,
J: Fn() -> I + Send + Sync,
R: Content<E>,
F: Fn(T, usize)->R + Send + Sync
{
Map(Default::default(), RwLock::new(iterator), callback)
Map(Default::default(), iterator, callback)
}
//pub fn reduce <E, T, I, R, F>(iterator: I, callback: F) -> Reduce<E, T, I, R, F> where
//E: Engine,
@ -77,21 +78,39 @@ impl<E: Engine, A: Content<E>, B: Content<E>> Content<E> for Either<E, A, B> {
}
}
pub struct Map<E, T, I, R, F>(PhantomData<E>, RwLock<I>, F) where
pub struct Map<E, T, I, J, R, F>(PhantomData<E>, J, F) where
E: Engine,
I: Iterator<Item = T> + Send + Sync,
J: Fn()->I + Send + Sync,
R: Content<E>,
F: Fn(T, usize)->R + Send + Sync;
impl<E, T, I, R, F> Content<E> for Map<E, T, I, R, F> where
impl<E, T, I, J, R, F> Content<E> for Map<E, T, I, J, R, F> where
E: Engine,
I: Iterator<Item = T> + Send + Sync,
J: Fn()->I + Send + Sync,
R: Content<E>,
F: Fn(T, usize)->R + Send + Sync
{
fn layout (&self, area: E::Area) -> E::Area {
let mut index = 0;
let mut max_w = 0;
let mut max_h = 0;
for item in (self.1)() {
let [x, y, w, h] = (self.2)(item, index).layout(area).xywh();
max_w = max_w.max((x + w).into());
max_h = max_h.max((y + h).into());
index += 1;
}
align_areas(
Alignment::Center,
area.xywh(),
[0.into(), 0.into(), max_w.into(), max_h.into()]
).into()
}
fn render (&self, to: &mut E::Output) {
let mut index = 0;
for item in &mut*self.1.write().unwrap() {
for item in (self.1)() {
(self.2)(item, index).render(to);
index += 1;
}