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

arranger: almost look like somethin now

Browse source
This commit is contained in:
🪞👃🪞 2025-05-17 16:23:13 +03:00
parent ef6aa9ab07
commit 701ea3fc27
5 changed files with 97 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,27 @@ pub trait TracksView:
fn tracks_width_available (&self) -> u16 {
(self.width() as u16).saturating_sub(40)
}
/// Iterate over tracks with their corresponding sizes.
fn tracks_with_sizes (&self) -> impl TracksSizes<'_> {
let editor_width = self.editor().map(|e|e.width());
let active_track = if let Some(width) = editor_width {
self.selection().track()
} else {
None
};
let mut x = 0;
self.tracks().iter().enumerate().map(move |(index, track)|{
let width = active_track
.and_then(|_|editor_width)
.unwrap_or(track.width.max(8));
let data = (index, track, x, x + width);
x += width + Self::TRACK_SPACING;
data
})
}
fn tracks_with_sizes_scrolled <'t> (&'t self) -> impl TracksSizes<'t> {
self.tracks_with_sizes(&self.selection(), self.is_editing().then_some(20/*FIXME*/))
self.tracks_with_sizes()
.skip(self.track_scroll())
.map_while(move|(t, track, x1, x2)|
((x2 as u16) < self.tracks_width_available())
.then_some((t, track, x1, x2)))
@ -23,10 +42,7 @@ pub trait TracksView:
fn view_track_names (&self, theme: ItemTheme) -> impl Content<TuiOut> {
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>)|{
for (index, track, x1, x2) in self
.tracks_with_sizes(&self.selection(), None)
.skip(self.track_scroll())
{
for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(track.width as u16,
Tui::bg(if self.selection().track() == Some(index) {
track.color.light.rgb
@ -53,11 +69,8 @@ pub trait TracksView:
let content = Align::w(Fixed::y(1 + max_outputs*2,
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::x(track.width as u16, Align::nw(Bsp::s(
for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(track.width as u16, Align::nw(Bsp::n(
Tui::bg(if self.selection().track() == Some(index) {
track.color.light.rgb
} else {
@ -89,10 +102,7 @@ pub trait TracksView:
)),
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())
{
for (index, track, x1, x2) in self.tracks_with_sizes() {
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!("·d{index}: {}", "--------"))))));
@ -106,12 +116,9 @@ pub trait TracksView:
}
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())
{
for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::xy(track.width as u16, h + 1,
Align::nw(Bsp::n(
Align::nw(Bsp::s(
Tui::bg(track.color.base.rgb,
Fill::x(Align::w(format!("·mon ·rec ·dub")))),
Map::south(1, ||track.sequencer.midi_ins.iter(),
@ -176,10 +183,7 @@ pub trait ClipsView: TracksView + ScenesView + Send + Sync {
-> impl Content<TuiOut> + 'a
{
Fill::xy(Stack::<TuiOut, _>::east(move|column: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (track_index, track, _, _) in self
.tracks_with_sizes(&self.selection(), None)
.skip(self.track_scroll())
{
for (track_index, track, _, _) in self.tracks_with_sizes() {
//column(&Fixed::x(5, Fill::xy(Tui::bg(Green, "kyp"))));
column(&Fixed::x(
if self.selection().track() == Some(track_index)