sweeeeping sweep

src/arranger/arranger_v/v_clips.rs

@@ -7,39 +7,42 @@ pub struct ArrangerVClips<'a> {
     tracks: &'a Vec<ArrangerTrack>,
     rows:   Vec<(usize, usize)>,
 }
-
-from!(<'a>|args:(&'a ArrangerTui, usize)|ArrangerVClips<'a> = Self {
-    size:   &args.0.size,
-    scenes: &args.0.scenes,
-    tracks: &args.0.tracks,
-    rows:   ArrangerScene::ppqs(&args.0.scenes, args.1),
-});
-
-render!(<Tui>|self: ArrangerVClips<'a>|Fill::xy(
-    col!((scene, pulses) in self.scenes.iter().zip(self.rows.iter().map(|row|row.0)) => {
-        Self::format_scene(self.tracks, scene, pulses)
-    })
-));
-
 impl<'a> ArrangerVClips<'a> {
+    pub fn new (state: &'a ArrangerTui, zoom: usize) -> Self {
+        Self {
+            size:   &state.size,
+            tracks: &state.tracks,
+            scenes: &state.scenes,
+            rows:   ArrangerScene::ppqs(&state.scenes, zoom),
+        }
+    }
+}
+impl<'a, E: Engine> Content<E> for ArrangerVClips<'a> {
+    fn content (&self) -> Option<impl Content<E>> {
+        let iter = self.scenes.iter().zip(self.rows.iter().map(|row|row.0));
+        let col  = col_iter!(iter => |(scene, pulses)|Self::format_scene(self.tracks, scene, pulses));
+        Some(Fill::xy(col))
+    }
+}
+impl<'a> ArrangerVClips<'a> {
+
     fn format_scene (
         tracks: &'a [ArrangerTrack], scene: &'a ArrangerScene, pulses: usize
-    ) -> impl Render<Tui> + use<'a> {
+    ) -> impl Content<Tui> + use<'a> {
         let height = 1.max((pulses / PPQ) as u16);
         let playing = scene.is_playing(tracks);
-        Fixed::y(height, row!([
+        Fixed::y(height, row!(
             Tui::bg(scene.color.base.rgb,
                 if playing { "▶ " } else { "  " }),
             Tui::fg_bg(scene.color.lightest.rgb, scene.color.base.rgb,
                 Expand::x(1, Tui::bold(true, scene.name.read().unwrap().as_str()))),
-            row!((index, track, x1, x2) in ArrangerTrack::with_widths(tracks) => {
+            row_iter!((index, track, x1, x2) in ArrangerTrack::with_widths(tracks) => {
                 Self::format_clip(scene, index, track, (x2 - x1) as u16, height)
-            })])
-        )
-    }
+            })))}
+
     fn format_clip (
         scene: &'a ArrangerScene, index: usize, track: &'a ArrangerTrack, w: u16, h: u16
-    ) -> impl Render<Tui> + use<'a> {
+    ) -> impl Content<Tui> + use<'a> {
         Fixed::xy(w, h, Layers::new(move |add|{
             if let Some(Some(phrase)) = scene.clips.get(index) {
                 let mut bg = TuiTheme::border_bg();