getting there, painstakingly 😄

This commit is contained in:
🪞👃🪞 2025-03-16 03:58:53 +02:00
parent 70ad0b343b
commit a4f0487324
4 changed files with 180 additions and 276 deletions

View file

@ -3,48 +3,59 @@ use crate::*;
impl<'a> ArrangerView<'a> {
/// Render track headers
pub(crate) fn tracks (&self) -> impl Content<TuiOut> + 'a {
pub(crate) fn tracks (&'a self) -> impl Content<TuiOut> + 'a {
Tryptich::center(1)
.left(self.width_side,
button_3("t", "track", self.track_count, self.is_editing))
button_3("t", "track", format!("{}", self.track_count), self.is_editing))
.right(self.width_side,
button_2("T", "add track", self.is_editing))
.middle(self.width_middle,
.middle(self.width_mid,
per_track(
self.width_middle,
self.tracks_sizes,
self.width_mid,
||self.tracks_with_sizes(),
|t, track|view_track_header(t, track, self.track_selected == Some(t))))
}
/// Render scenes with clips
pub(crate) fn scenes (&self) -> impl Content<TuiOut> + 'a {
Tui::bg(Reset, Bsp::s(self.track_scroll,
Bsp::e(self.scene_scroll,
Fixed::y(self.scenes_height,
Tryptich::center(self.scenes_height)
.left(self.width_side,
Map::new(self.scenes_with_scene_colors(), self.scene_name()))
.middle(self.width_mid,
per_track(self.width_mid, self.track_sizes(), self.scene_track()))))))
pub(crate) fn scenes (&'a self) -> impl Content<TuiOut> + 'a {
Tryptich::center(self.scenes_height)
.left(self.width_side, Map::new(
||self.scenes_with_scene_colors(),
move|(index, scene, y1, y2, previous): SceneWithColor, _|{
let offset = y1 as u16;
let height = (1 + y2 - y1) as u16;
let is_last = self.scene_last == index;
view_scene_name(
self.width, height, offset,
index, scene, previous, is_last, self.scene_selected
)
}))
.middle(self.width_mid, per_track(
self.width_mid,
||self.tracks_with_sizes(),
move|track_index, track|Map::new(
||self.scenes_with_track_colors(),
move|(scene_index, scene, y1, y2, prev_scene): SceneWithColor, _|
view_scene_clip(
self.width_mid,
(1 + y2 - y1) as u16,
y1 as u16,
scene,
prev_scene,
scene_index,
track_index,
self.is_editing,
self.track_selected == Some(track_index),
self.scene_selected,
self.scene_last == scene_index,
&self.app.editor
))))
}
fn scene_add (&self) -> impl Content<TuiOut> + 'a {
let editing = self.is_editing();
let data = (self.selected().scene().unwrap_or(0), self.scenes().len());
self.fmtd.write().unwrap().scns.update(Some(data), rewrite!(buf, "({}/{})", data.0, data.1));
button_3("S", "add scene", self.fmtd.read().unwrap().scns.view.clone(), editing)
}
fn scene_name (&self) -> impl Content<TuiOut> + 'a {
let width = self.width_full;
let scene_last = self.scene_last;
let scene_selected = self.scene_selected;
move|(index, scene, y1, y2, previous): SceneWithColor, _|{
let offset = y1 as u16;
let height = (1 + y2 - y1) as u16;
let is_last = scene_last == index;
view_scene_name(width, height, offset, index, scene, previous, is_last, scene_selected)
}
fn scene_add (&'a self) -> impl Content<TuiOut> + 'a {
let data = (self.scene_selected.unwrap_or(0), self.scene_count);
self.app.fmtd.write().unwrap().scns.update(Some(data), rewrite!(buf, "({}/{})", data.0, data.1));
button_3("S", "add scene", self.app.fmtd.read().unwrap().scns.view.clone(), self.is_editing)
}
fn scenes_with_scene_colors (&'a self) -> impl ScenesColors<'a> {
@ -69,25 +80,6 @@ impl<'a> ArrangerView<'a> {
self.app.fmtd.read().unwrap().trks.view.clone()
}
fn scene_track (&self) -> impl Content<TuiOut> + 'a {
move|track_index, track|Map::new(
self.scenes_with_track_colors(),
move|(scene_index, scene, y1, y2, prev_scene): SceneWithColor, _|view_scene_clip(
self.width_mid,
(1 + y2 - y1) as u16,
y1 as u16,
scene,
prev_scene,
scene_index,
track_index,
self.is_editing,
self.track_selected == Some(track_index),
self.scene_selected,
self.scene_last == scene_index,
self.app.editor
))
}
}
fn view_track_header <'a> (
@ -128,7 +120,7 @@ pub(crate) fn view_scene_clip <'a> (
width: u16,
height: u16,
offset: u16,
scene: &Scene,
scene: &'a Scene,
prev: Option<ItemPalette>,
scene_index: usize,
track_index: usize,
@ -136,7 +128,7 @@ pub(crate) fn view_scene_clip <'a> (
same_track: bool,
scene_selected: Option<usize>,
scene_is_last: bool,
editor: &Option<MidiEditor>,
editor: &'a Option<MidiEditor>,
) -> impl Content<TuiOut> + use<'a> {
let (name, fg, bg) = if let Some(clip) = &scene.clips[track_index] {
let clip = clip.read().unwrap();
@ -183,19 +175,3 @@ pub(crate) fn view_scene_cell <'a> (
)
}
}
#[cfg(test)] #[test] fn test_view_scene () {
let mut output = TuiOut::default();
output.area[2] = 9;
output.area[3] = 9;
Content::render(&view_scenes(), &mut output);
}
#[cfg(test)] #[test] fn test_view_track () {
let mut output = TuiOut::default();
output.area[2] = 9;
output.area[3] = 9;
Content::render(&view_tracks(), &mut output);
}