well at least now they're equally misaligned

This commit is contained in:
🪞👃🪞 2025-01-23 21:08:17 +01:00
parent 2433239eaa
commit 41d31e4db6

View file

@ -193,8 +193,8 @@ impl Tek {
&'a self, w: u16, h: u16, a: impl Content<TuiOut> + 'a, b: impl Content<TuiOut> + 'a
) -> impl Content<TuiOut> + 'a {
Fixed::y(h, Bsp::a(
Fill::x(Align::w(Fixed::x(self.w_sidebar() as u16, a))),
Fill::x(Align::c(Fixed::x(w, b)))
Fill::x(Align::w(Fixed::xy(self.w_sidebar() as u16, h, a))),
Fill::x(Align::c(Fixed::xy(w, h, b)))
))
}
fn view_inputs (&self) -> impl Content<TuiOut> + use<'_> {
@ -322,11 +322,10 @@ impl Tek {
let tab = " Tab ";
let last_color = self.fmtd.read().unwrap().last_color.clone();
let same_track = selected_track == Some(t+1);
Outer(true, bstyle).enclose_bg(Map::new(scenes, move|(_, scene, y1, y2), s|{
Map::new(scenes, move|(_, scene, y1, y2), s| {
let height = (1 + y2 - y1) as u16;
let last_color = last_color.clone();
Thunk::new(move||{
let last_color = last_color.clone();
let mut fg = Tui::g(64);
let mut bg = ItemPalette::G[32];
if let Some(clip) = &scene.clips[t] {
@ -368,8 +367,8 @@ impl Tek {
When::new(selected, Fill::y(Align::n(button(tab, "edit")))),
phat_sel_3(
selected,
Fill::xy(label()),
Fill::xy(label()),
label(),
label(),
top,
mid,
Some(Reset)
@ -379,7 +378,7 @@ impl Tek {
Push::y(1, Fixed::y(height, Outer(false, bstyle)
.enclose(Either::new(active, editor, cell))))))
})
}))
})
});
let border = move|x|Outer(false, bstyle).enclose_bg(x);
border(self.view_row(