mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-08 04:36:45 +01:00
well at least now they're equally misaligned
This commit is contained in:
parent
2433239eaa
commit
41d31e4db6
1 changed files with 6 additions and 7 deletions
|
|
@ -193,8 +193,8 @@ impl Tek {
|
||||||
&'a self, w: u16, h: u16, a: impl Content<TuiOut> + 'a, b: impl Content<TuiOut> + 'a
|
&'a self, w: u16, h: u16, a: impl Content<TuiOut> + 'a, b: impl Content<TuiOut> + 'a
|
||||||
) -> impl Content<TuiOut> + 'a {
|
) -> impl Content<TuiOut> + 'a {
|
||||||
Fixed::y(h, Bsp::a(
|
Fixed::y(h, Bsp::a(
|
||||||
Fill::x(Align::w(Fixed::x(self.w_sidebar() as u16, a))),
|
Fill::x(Align::w(Fixed::xy(self.w_sidebar() as u16, h, a))),
|
||||||
Fill::x(Align::c(Fixed::x(w, b)))
|
Fill::x(Align::c(Fixed::xy(w, h, b)))
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
fn view_inputs (&self) -> impl Content<TuiOut> + use<'_> {
|
fn view_inputs (&self) -> impl Content<TuiOut> + use<'_> {
|
||||||
|
|
@ -322,11 +322,10 @@ impl Tek {
|
||||||
let tab = " Tab ";
|
let tab = " Tab ";
|
||||||
let last_color = self.fmtd.read().unwrap().last_color.clone();
|
let last_color = self.fmtd.read().unwrap().last_color.clone();
|
||||||
let same_track = selected_track == Some(t+1);
|
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 height = (1 + y2 - y1) as u16;
|
||||||
let last_color = last_color.clone();
|
let last_color = last_color.clone();
|
||||||
Thunk::new(move||{
|
Thunk::new(move||{
|
||||||
let last_color = last_color.clone();
|
|
||||||
let mut fg = Tui::g(64);
|
let mut fg = Tui::g(64);
|
||||||
let mut bg = ItemPalette::G[32];
|
let mut bg = ItemPalette::G[32];
|
||||||
if let Some(clip) = &scene.clips[t] {
|
if let Some(clip) = &scene.clips[t] {
|
||||||
|
|
@ -368,8 +367,8 @@ impl Tek {
|
||||||
When::new(selected, Fill::y(Align::n(button(tab, "edit")))),
|
When::new(selected, Fill::y(Align::n(button(tab, "edit")))),
|
||||||
phat_sel_3(
|
phat_sel_3(
|
||||||
selected,
|
selected,
|
||||||
Fill::xy(label()),
|
label(),
|
||||||
Fill::xy(label()),
|
label(),
|
||||||
top,
|
top,
|
||||||
mid,
|
mid,
|
||||||
Some(Reset)
|
Some(Reset)
|
||||||
|
|
@ -379,7 +378,7 @@ impl Tek {
|
||||||
Push::y(1, Fixed::y(height, Outer(false, bstyle)
|
Push::y(1, Fixed::y(height, Outer(false, bstyle)
|
||||||
.enclose(Either::new(active, editor, cell))))))
|
.enclose(Either::new(active, editor, cell))))))
|
||||||
})
|
})
|
||||||
}))
|
})
|
||||||
});
|
});
|
||||||
let border = move|x|Outer(false, bstyle).enclose_bg(x);
|
let border = move|x|Outer(false, bstyle).enclose_bg(x);
|
||||||
border(self.view_row(
|
border(self.view_row(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue