From 41d31e4db683cda318b0cbb4b3098f04ca5c331c Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 23 Jan 2025 21:08:17 +0100 Subject: [PATCH] well at least now they're equally misaligned --- tek/src/view.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tek/src/view.rs b/tek/src/view.rs index 2faf5120..24893743 100644 --- a/tek/src/view.rs +++ b/tek/src/view.rs @@ -193,8 +193,8 @@ impl Tek { &'a self, w: u16, h: u16, a: impl Content + 'a, b: impl Content + 'a ) -> impl Content + '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 + 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(