view refactors; remove view_sizes

app/src/view/view_track.rs

@@ -18,7 +18,7 @@ impl<'a> ArrangerView<'a> {
         let Self {
             width, width_side, width_mid,
             scenes_height, scene_last, scene_selected,
-            track_selected, is_editing, ..
+            track_selected, is_editing, app: Tek { editor, .. }, ..
         } = self;
         Tryptich::center(*scenes_height)
             .left(*width_side, Map::new(||self.scenes_with_scene_colors(),
@@ -47,28 +47,25 @@ impl<'a> ArrangerView<'a> {
                             *track_selected == Some(track_index),
                             *scene_selected,
                             *scene_last == scene_index,
-                            &self.app.editor
+                            editor
                         ))))
     }
 
     fn scene_add (&'a self) -> impl Content<TuiOut> + 'a {
-        let Self {
-            scene_selected, scene_count, is_editing, app: Tek { view_cache, .. }, ..
-        } = self;
-        let data = (scene_selected.unwrap_or(0), *scene_count);
-        view_cache.write().unwrap()
-            .scns.update(Some(data), rewrite!(buf, "({}/{})", data.0, data.1));
-        button_3("S", "add scene", view_cache.read().unwrap().scns.view.clone(), *is_editing)
+        ViewCache::scene_add(
+            &self.app.view_cache,
+            self.scene_selected.unwrap_or(0),
+            self.scene_count,
+            self.is_editing,
+        )
     }
 
     fn track_counter (&'a self) -> Arc<RwLock<String>> {
-        let Self {
-            track_selected, track_count, app: Tek { view_cache, .. }, ..
-        } = self;
-        let data = (track_selected.unwrap_or(0), *track_count);
-        view_cache.write().unwrap()
-            .trks.update(Some(data), rewrite!(buf, "{}/{}", data.0, data.1));
-        view_cache.read().unwrap().trks.view.clone()
+        ViewCache::track_counter(
+            &self.app.view_cache,
+            self.track_selected.unwrap_or(0),
+            self.track_count,
+        )
     }
 
 }
@@ -93,15 +90,7 @@ pub(crate) fn view_scene_name (
     select: Option<usize>,
 ) -> impl Content<TuiOut> {
     Fill::x(map_south(offset, height, Fixed::y(height, view_scene_cell(
-        " ⯈ ",
-        Some(scene.name.clone()),
-        last,
-        select,
-        true,
-        index,
-        &scene.color,
-        prev,
-        scene.color.lightest.rgb
+        " ⯈ ", Some(scene.name.clone()), &scene.color, prev, last, select, true, index,
     ))))
 }
 
@@ -110,7 +99,7 @@ pub(crate) fn view_scene_clip <'a> (
     height:         u16,
     offset:         u16,
     scene:          &'a Scene,
-    prev:           Option<ItemPalette>,
+    prev_bg:        Option<ItemPalette>,
     scene_index:    usize,
     track_index:    usize,
     editing:        bool,
@@ -119,37 +108,29 @@ pub(crate) fn view_scene_clip <'a> (
     scene_is_last:  bool,
     editor:         &'a Option<MidiEditor>,
 ) -> impl Content<TuiOut> + use<'a> {
-    let (name, fg, bg) = if let Some(clip) = &scene.clips[track_index] {
+    let (name, _fg, bg) = if let Some(clip) = &scene.clips[track_index] {
         let clip = clip.read().unwrap();
         (Some(clip.name.clone()), clip.color.lightest.rgb, clip.color)
     } else {
         (None, Tui::g(96), ItemPalette::G[32])
     };
     let active = editing && same_track && scene_selected == Some(scene_index);
-    let edit = |x|Bsp::b(x, When(active, editor));
-    map_south(offset, height, edit(Fixed::y(height, view_scene_cell(
-        " ⏹ ",
-        name,
-        scene_is_last,
-        scene_selected,
-        same_track,
-        scene_index,
-        &bg,
-        prev,
-        fg
+    let with_editor = |x|Bsp::b(x, When(active, editor));
+    map_south(offset, height, with_editor(Fixed::y(height, view_scene_cell(
+        " ⏹ ", name, &bg, prev_bg,
+        scene_is_last, scene_selected, same_track, scene_index,
     ))))
 }
 
 pub(crate) fn view_scene_cell <'a> (
     icon:       &'a str,
     name:       Option<Arc<str>>,
+    color:      &ItemPalette,
+    prev_color: Option<ItemPalette>,
     is_last:    bool,
     selected:   Option<usize>,
     same_track: bool,
     scene:      usize,
-    color:      &ItemPalette,
-    prev_color: Option<ItemPalette>,
-    fg:         Color,
 ) -> impl Content<TuiOut> + use<'a> {
     Phat {
         width:   0,