arranger: layout track headers with Stack

This commit is contained in:
🪞👃🪞 2025-05-17 10:37:32 +03:00
parent a7f37e52cf
commit 0d9bb709a5
2 changed files with 65 additions and 48 deletions

View file

@ -201,75 +201,92 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
.then_some((t, track, x1, x2))) .then_some((t, track, x1, x2)))
} }
fn view_track_names (&self, theme: ItemTheme) -> impl Content<TuiOut> { fn view_track_names (&self, theme: ItemTheme) -> impl Content<TuiOut> {
let mut max_outputs = 0u16; let header = Fixed::x(20, Tui::bg(theme.darkest.rgb,
for track in self.tracks().iter() { row!(Tui::bold(true, "[t]rack"), "[T] add")));
max_outputs = max_outputs.max(track.sequencer.midi_outs.len() as u16); let content = Fixed::y(1, Align::w(Tui::bg(theme.darker.rgb, Align::w(Fill::x(
} Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
Bsp::w( for (index, track, x1, x2) in self
Fixed::x(20, Tui::bg(theme.darkest.rgb, .tracks_with_sizes(&self.selection(), None)
col!(Tui::bold(true, "[t]rack"), "[T] Add"))), .skip(self.track_scroll())
Align::w(Fixed::y(max_outputs + 1, Tui::bg(theme.darker.rgb, {
Align::w(Fill::x(Map::new( (add)(&Fixed::x(track.width as u16,
||self.tracks_with_sizes(&self.selection(), None).skip(self.track_scroll()), Tui::bg(track.color.dark.rgb, Align::nw(Tui::fg(
move|(index, track, x1, x2): (usize, &Track, usize, usize), _| Rgb(255, 255, 255), Tui::bold(true,
Push::x(index as u16 * 14, Fixed::xy(track.width as u16, max_outputs + 1, format!("{}", track.name)))))));
Tui::bg(track.color.dark.rgb, Align::nw(Bsp::s(Tui::fg( }
Rgb(255, 255, 255), }))))));
Tui::bold(true, format!("{}", track.name)) Bsp::w(header, content)
), format!("{index} {x1} {x2}")))))))))))))
} }
fn view_track_outputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> { fn view_track_outputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> {
let mut max_outputs = 0u16; let mut max_outputs = 0u16;
for track in self.tracks().iter() { for track in self.tracks().iter() {
max_outputs = max_outputs.max(track.sequencer.midi_outs.len() as u16); max_outputs = max_outputs.max(track.sequencer.midi_outs.len() as u16);
} }
Bsp::w( let header = Fixed::x(20, Tui::bg(theme.darkest.rgb,
Fixed::x(20, Tui::bg(theme.darkest.rgb, col!(Tui::bold(true, "[o]utput"), "[O] Add")));
col!(Tui::bold(true, "[o]utput"), "[O] Add"))), let content = Align::w(Fixed::y(max_outputs + 1,
Align::w(Fixed::y(max_outputs + 1, Tui::bg(theme.darker.rgb, Align::w(Fill::x(Map::new( Tui::bg(theme.darker.rgb, Align::w(Fill::x(
||self.tracks_with_sizes(&self.selection(), None).skip(self.track_scroll()), Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
move|(index, track, x1, x2): (usize, &'a Track, usize, usize), _| for (index, track, x1, x2) in self
Push::x(x2 as u16, Tui::bg(track.color.dark.rgb, Fixed::xy( .tracks_with_sizes(&self.selection(), None)
track.width as u16, .skip(self.track_scroll())
max_outputs + 1, {
Align::nw(Bsp::s( (add)(&Fixed::x(track.width as u16, Align::nw(Bsp::s(
format!("[mut] [sol]"), format!("[mut] [sol]"),
Map::south(1, ||track.sequencer.midi_outs.iter(), Map::south(1, ||track.sequencer.midi_outs.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255), |port, index|Tui::fg(Rgb(255, 255, 255),
format!("{index}: {}", port.name()))))))))))))))) format!("{index}: {}", port.name())))))));
}
}))))));
Bsp::w(header, content)
} }
fn view_track_inputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> { fn view_track_inputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> {
let mut max_inputs = 0u16; let mut h = 0u16;
for track in self.tracks().iter() { for track in self.tracks().iter() {
max_inputs = max_inputs.max(track.sequencer.midi_ins.len() as u16); h = h.max(track.sequencer.midi_ins.len() as u16);
} }
Bsp::w( let header = Tui::bg(theme.darkest.rgb, row!(Tui::bold(true, "[i]nputs"), "[I] Add"));
Fixed::x(20, Tui::bg(theme.darkest.rgb, let content = Tui::bg(theme.darker.rgb, Align::w(Fill::x(
col!(Tui::bold(true, "[i]nputs"), "[I] Add"))), Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
Fill::x(Align::w(Fixed::y(max_inputs + 1, Tui::bg(theme.darker.rgb, Align::w(Fill::x(Map::new( for (index, track, x1, x2) in self
||self.tracks_with_sizes(&self.selection(), None).skip(self.track_scroll()), .tracks_with_sizes(&self.selection(), None)
move|(index, track, x1, x2): (usize, &'a Track, usize, usize), _| .skip(self.track_scroll())
Push::x(x2 as u16, Fixed::xy(track.width as u16, max_inputs + 1, {
add(&Fixed::xy(track.width as u16, h + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Bsp::s( Tui::bg(track.color.dark.rgb, Align::nw(Bsp::s(
format!("[rec] [mon]"), format!("[rec] [mon]"),
Map::south(1, ||track.sequencer.midi_ins.iter(), Map::south(1, ||track.sequencer.midi_ins.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255), |port, index|Tui::fg(Rgb(255, 255, 255),
format!("{index}: {}", port.name())))))))))))))))) format!("{index}: {}", port.name()))))))));
}
}))));
Bsp::w(
Fixed::x(20, header),
Fixed::y(h, Fill::x(Align::w(Fixed::y(h + 1, content)))),
)
} }
fn view_track_devices <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> { fn view_track_devices <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> {
let mut max_devices = 2u16; let mut h = 2u16;
for track in self.tracks().iter() { for track in self.tracks().iter() {
max_devices = max_devices.max(track.devices.len() as u16); h = h.max(track.devices.len() as u16);
} }
let header = Tui::bg(theme.darkest.rgb, col!(Tui::bold(true, "[d]evice"), "[D] Add"));
let content = Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, x1, x2) in self
.tracks_with_sizes(&self.selection(), None)
.skip(self.track_scroll())
{
add(&Fixed::xy(track.width as u16, h + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Map::south(1, move||0..h,
|_, index|format!("{index}: {}", "--------"))))));
}
}))));
Bsp::w( Bsp::w(
Fixed::x(20, Tui::bg(theme.darkest.rgb, Fixed::x(20, header),
col!(Tui::bold(true, "[d]evice"), "[D] Add"))), Fixed::y(h, content),
Fixed::y(max_devices, Tui::bg(theme.darker.rgb, Align::w(Fill::x(Map::new( )
||self.tracks_with_sizes(&self.selection(), None).skip(self.track_scroll()),
move|(index, track, x1, x2): (usize, &'a Track, usize, usize), _|
Push::x(x2 as u16, Fixed::xy(track.width as u16, max_devices + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Map::south(1, move||0..max_devices,
|_, index|format!("{index}: {}", "--------"))))))))))))
} }
} }

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit b25977d878713f3ab89ed12b910eed67a1f88524 Subproject commit a55e84c29f51606e0996f7f88b7664ca0d37365b