wip: move more view methods to device trait

crates/device/src/arranger/arranger_scenes.rs

@@ -1,8 +1,43 @@
 use crate::*;
 
+impl<T: Has<Vec<Scene>> + Send + Sync> HasScenes for T {}
+
+pub trait HasScenes: Has<Vec<Scene>> + Send + Sync {
+    fn scenes (&self) -> &Vec<Scene> {
+        Has::<Vec<Scene>>::get(self)
+    }
+    fn scenes_mut (&mut self) -> &mut Vec<Scene> {
+        Has::<Vec<Scene>>::get_mut(self)
+    }
+    fn scenes_with_sizes (
+        &self, 
+        editing:        bool,
+        height:         usize,
+        larger:         usize,
+        selected_track: Option<usize>,
+        selected_scene: Option<usize>,
+    ) -> impl ScenesSizes<'_> {
+        let mut y = 0;
+        self.scenes().iter().enumerate().map(move|(s, scene)|{
+            let active = editing && selected_track.is_some() && selected_scene == Some(s);
+            let height = if active { larger } else { height };
+            let data   = (s, scene, y, y + height);
+            y += height;
+            data
+        })
+    }
+    /// Generate the default name for a new scene
+    fn scene_default_name (&self) -> Arc<str> {
+        format!("Sc{:3>}", self.scenes().len() + 1).into()
+    }
+    fn scene_longest_name (&self) -> usize {
+        self.scenes().iter().map(|s|s.name.len()).fold(0, usize::max)
+    }
+}
+
 pub type SceneWith<'a, T: Send + Sync> = (usize, &'a Scene, usize, usize, T);
 
-pub trait ArrangerSceneRows: Send + Sync {
+pub trait ScenesView: Send + Sync {
     /// Default scene height.
     const H_SCENE: usize = 2;
     /// Default editor height.
@@ -49,6 +84,18 @@ pub trait ArrangerSceneRows: Send + Sync {
                 })))
             }))
     }
+    fn scenes_names_2 (&self, theme: ItemTheme) -> impl Content<TuiOut> {
+        let h  = self.scenes().len() as u16 * 2;
+        let bg = theme.darker.rgb;
+        Fixed::y(h, Tui::bg(bg, Align::w(Fill::x(Map::new(
+            ||self.scenes().iter().skip(self.project.scene_scroll),
+            move|scene: &Scene, index|
+                Push::y(index as u16 * 2u16, Fixed::xy(20, 2,
+                    Tui::bg(scene.color.dark.rgb, Align::nw(Bsp::e(
+                        format!(" {index:2} "),
+                        Tui::fg(Rgb(255, 255, 255),
+                            Tui::bold(true, format!("{}", scene.name)))))))))))))
+    }
     fn scenes_with_prev_color (&self) -> impl Iterator<Item=SceneWith<Option<ItemTheme>>> + Send + Sync {
         self.scenes_iter().map(|(s, scene, y1, y2)|(s, scene, y1, y2,
             (s>0).then(||self.arrangement().scenes()[s-1].color)))
@@ -102,6 +149,28 @@ pub trait ArrangerSceneRows: Send + Sync {
                     )))
                 })))
     }
+    fn scenes_clips_2 <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> + use<'a> {
+        let h  = self.scenes().len() as u16 * 2;
+        let bg = theme.darker.rgb;
+        Fixed::y(h, Tui::bg(bg, Align::w(Fill::x(Map::new(
+            ||self.scenes().iter().skip(self.project.scene_scroll),
+            move|scene: &'a Scene, index1|
+                Push::y(index1 as u16 * 2u16, Fixed::xy(20, 2,
+                    Map::new(
+                        move||scene.clips.iter().skip(self.project.track_scroll),
+                        move|clip: &'a Option<Arc<RwLock<MidiClip>>>, index2|{
+                            let (theme, text) = if let Some(clip) = clip {
+                                let clip = clip.read().unwrap();
+                                (clip.color, clip.name.clone())
+                            } else {
+                                (scene.color, Default::default())
+                            };
+                            Push::x(index2 as u16 * 14, Tui::bg(theme.dark.rgb, Bsp::e(
+                                format!(" {index1:2} {index2:2} "),
+                                Tui::fg(Rgb(255, 255, 255),
+                                    Tui::bold(true, format!("{}", text))))))
+                        }))))))))
+    }
     fn scenes_with_clip (&self, track_index: usize) -> impl Iterator<Item=SceneWith<'_, Option<ItemTheme>>> + Send + Sync {
         self.scenes_iter().map(move|(s, scene, y1, y2)|(s, scene, y1, y2,
             (s>0).then(||self.arrangement().scenes()[s-1].clips[track_index].as_ref()
@@ -130,7 +199,7 @@ pub trait ArrangerSceneRows: Send + Sync {
     }
 }
 
-impl<'a> ArrangerSceneRows for ArrangerView<'a> {
+impl<'a> ScenesView for ArrangerView<'a> {
     fn arrangement (&self) -> &Arrangement {
         self.arrangement
     }
@@ -157,41 +226,6 @@ impl<'a> ArrangerSceneRows for ArrangerView<'a> {
     }
 }
 
-impl<T: Has<Vec<Scene>> + Send + Sync> HasScenes for T {}
-
-pub trait HasScenes: Has<Vec<Scene>> + Send + Sync {
-    fn scenes (&self) -> &Vec<Scene> {
-        Has::<Vec<Scene>>::get(self)
-    }
-    fn scenes_mut (&mut self) -> &mut Vec<Scene> {
-        Has::<Vec<Scene>>::get_mut(self)
-    }
-    fn scenes_with_sizes (
-        &self, 
-        editing:        bool,
-        height:         usize,
-        larger:         usize,
-        selected_track: Option<usize>,
-        selected_scene: Option<usize>,
-    ) -> impl ScenesSizes<'_> {
-        let mut y = 0;
-        self.scenes().iter().enumerate().map(move|(s, scene)|{
-            let active = editing && selected_track.is_some() && selected_scene == Some(s);
-            let height = if active { larger } else { height };
-            let data   = (s, scene, y, y + height);
-            y += height;
-            data
-        })
-    }
-    /// Generate the default name for a new scene
-    fn scene_default_name (&self) -> Arc<str> {
-        format!("Sc{:3>}", self.scenes().len() + 1).into()
-    }
-    fn scene_longest_name (&self) -> usize {
-        self.scenes().iter().map(|s|s.name.len()).fold(0, usize::max)
-    }
-}
-
 impl<T: HasScenes + HasTracks> AddScene for T {}
 
 pub trait AddScene: HasScenes + HasTracks {