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

align track header headers

Browse source
This commit is contained in:
🪞👃🪞 2025-05-17 10:51:07 +03:00
parent 0d9bb709a5
commit a9288cb0c2
1 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

65
crates/device/src/arranger/arranger_view.rs
View file

@ -201,8 +201,6 @@ 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 header = Fixed::x(20, Tui::bg(theme.darkest.rgb,
row!(Tui::bold(true, "[t]rack"), "[T] add")));
let content = Fixed::y(1, Align::w(Tui::bg(theme.darker.rgb, Align::w(Fill::x( 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>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, x1, x2) in self for (index, track, x1, x2) in self
@ -210,20 +208,21 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
.skip(self.track_scroll()) .skip(self.track_scroll())
{ {
(add)(&Fixed::x(track.width as u16, (add)(&Fixed::x(track.width as u16,
Tui::bg(track.color.dark.rgb, Align::nw(Tui::fg( Tui::bg(track.color.base.rgb, Align::nw(Tui::fg(
Rgb(255, 255, 255), Tui::bold(true, Rgb(255, 255, 255), Tui::bold(true,
format!("{}", track.name))))))); format!("{}", track.name)))))));
} }
})))))); }))))));
Bsp::w(header, content) Bsp::w(
self.view_track_header(theme, row!(Tui::bold(true, "[t]rack "), "[T] +")),
content
)
} }
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);
} }
let header = Fixed::x(20, Tui::bg(theme.darkest.rgb,
col!(Tui::bold(true, "[o]utput"), "[O] Add")));
let content = Align::w(Fixed::y(max_outputs + 1, let content = Align::w(Fixed::y(max_outputs + 1,
Tui::bg(theme.darker.rgb, Align::w(Fill::x( Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
@ -232,20 +231,23 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
.skip(self.track_scroll()) .skip(self.track_scroll())
{ {
(add)(&Fixed::x(track.width as u16, Align::nw(Bsp::s( (add)(&Fixed::x(track.width as u16, Align::nw(Bsp::s(
format!("[mut] [sol]"), Tui::bg(track.color.base.rgb, Fill::x(Align::w(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()))))))); Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("{index}: {}", port.name()))))))))));
} }
})))))); }))))));
Bsp::w(header, content) Bsp::w(
self.view_track_header(theme, row!(Tui::bold(true, "[o]utput"), "[O] +")),
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 h = 0u16; let mut h = 0u16;
for track in self.tracks().iter() { for track in self.tracks().iter() {
h = h.max(track.sequencer.midi_ins.len() as u16); h = h.max(track.sequencer.midi_ins.len() as u16);
} }
let header = Tui::bg(theme.darkest.rgb, row!(Tui::bold(true, "[i]nputs"), "[I] Add"));
let content = Tui::bg(theme.darker.rgb, Align::w(Fill::x( let content = Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, x1, x2) in self for (index, track, x1, x2) in self
@ -253,16 +255,17 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
.skip(self.track_scroll()) .skip(self.track_scroll())
{ {
add(&Fixed::xy(track.width as u16, h + 1, add(&Fixed::xy(track.width as u16, h + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Bsp::s( Align::nw(Bsp::s(
format!("[rec] [mon]"), Tui::bg(track.color.base.rgb,
Fill::x(Align::w(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_bg(Rgb(255, 255, 255), track.color.dark.rgb,
format!("{index}: {}", port.name())))))))); Fill::x(Align::w(format!("{index}: {}", port.name())))))))));
} }
})))); }))));
Bsp::w( Bsp::w(
Fixed::x(20, header), self.view_track_header(theme, row!(Tui::bold(true, "[i]nputs"), "[I] +")),
Fixed::y(h, Fill::x(Align::w(Fixed::y(h + 1, content)))), Fixed::y(h, Fill::x(Align::w(Fixed::y(h + 1, content)))),
) )
} }
@ -271,22 +274,24 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
for track in self.tracks().iter() { for track in self.tracks().iter() {
h = h.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, header), self.view_track_header(theme, row!(Tui::bold(true, "[d]evice "), "[D]+")),
Fixed::y(h, content), Fixed::y(h, 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}: {}", "--------"))))));
}
}))))))
}
fn view_track_header <'a, T: Content<TuiOut>> (
&'a self, theme: ItemTheme, content: T
) -> impl Content<TuiOut> {
Fixed::x(20, Tui::bg(theme.darker.rgb, Fill::x(Align::e(content))))
} }
} }