trying to add skinny black borders around things

tek/src/arranger/arranger_scene.rs

@@ -1,4 +1,36 @@
 use crate::*;
+#[derive(Clone, Debug)]
+pub enum ArrangerSceneCommand {
+    Add,
+    Delete(usize),
+    Swap(usize, usize),
+    SetSize(usize),
+    SetZoom(usize),
+    SetColor(usize, ItemPalette),
+    Enqueue(usize),
+}
+command!(|self: ArrangerSceneCommand, state: Arranger|match self {
+    Self::Add => {
+        state.scene_add(None, None)?;
+        None
+    }
+    Self::Delete(index) => {
+        state.scene_del(index);
+        None
+    },
+    Self::SetColor(index, color) => {
+        let old = state.scenes[index].color;
+        state.scenes[index].color = color;
+        Some(Self::SetColor(index, old))
+    },
+    Self::Enqueue(scene) => {
+        for track in 0..state.tracks.len() {
+            state.tracks[track].player.enqueue_next(state.scenes[scene].clips[track].as_ref());
+        }
+        None
+    },
+    _ => None
+});
 impl Arranger {
     pub fn scene_add (&mut self, name: Option<&str>, color: Option<ItemPalette>)
         -> Usually<&mut ArrangerScene>

tek/src/arranger/arranger_track.rs

@@ -1,4 +1,30 @@
 use crate::*;
+#[derive(Clone, Debug)]
+pub enum ArrangerTrackCommand {
+    Add,
+    Delete(usize),
+    Stop(usize),
+    Swap(usize, usize),
+    SetSize(usize),
+    SetZoom(usize),
+    SetColor(usize, ItemPalette),
+}
+command!(|self: ArrangerTrackCommand, state: Arranger|match self {
+    Self::Add => {
+        state.track_add(None, None)?;
+        None
+    },
+    Self::SetColor(index, color) => {
+        let old = state.tracks[index].color;
+        state.tracks[index].color = color;
+        Some(Self::SetColor(index, old))
+    },
+    Self::Stop(track) => {
+        state.tracks[track].player.enqueue_next(None);
+        None
+    },
+    _ => None
+});
 impl Arranger {
     pub fn track_next_name (&self) -> Arc<str> {
         format!("Tr{:02}", self.tracks.len() + 1).into()

tek/src/pool.rs

@@ -1,4 +1,3 @@
-mod pool_tui;    pub use self::pool_tui::*;
 mod clip_length; pub use self::clip_length::*;
 mod clip_rename; pub use self::clip_rename::*;
 
@@ -19,6 +18,31 @@ pub struct PoolModel {
     scroll: usize,
 }
 
+pub struct PoolView<'a>(pub bool, pub &'a PoolModel);
+render!(TuiOut: (self: PoolView<'a>) => {
+    let Self(compact, model) = self;
+    let PoolModel { clips, mode, .. } = self.1;
+    let color  = self.1.clip().read().unwrap().color;
+    let on_bg  = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x));
+    let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x);
+    Tui::bg(Color::Green, Fixed::y(clips.len() as u16, on_bg(border(Map::new(||model.clips().iter(), move|clip, i|{
+        let item_height = 1;
+        let item_offset = i as u16 * item_height;
+        let selected    = i == model.clip_index();
+        let MidiClip { ref name, color, length, .. } = *clip.read().unwrap();
+        let bg     = if selected { color.light.rgb } else { color.base.rgb };
+        let fg     = color.lightest.rgb;
+        let name   = if *compact { format!(" {i:>3}") } else { format!(" {i:>3} {name}") };
+        let length = if *compact { String::default()  } else { format!("{length}  ") };
+        Fixed::y(1, map_south(item_offset, item_height, Tui::bg(bg, lay!(
+            Fill::x(Align::w(Tui::fg(fg, Tui::bold(selected, name)))),
+            Fill::x(Align::e(Tui::fg(fg, Tui::bold(selected, length)))),
+            Fill::x(Align::w(When(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "▶"))))),
+            Fill::x(Align::e(When(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "◀"))))),
+        ))))
+    })))))
+});
+
 /// Modes for clip pool
 #[derive(Debug, Clone)]
 pub enum PoolMode {

tek/src/pool/pool_tui.rs

@@ -1,24 +0,0 @@
-use crate::*;
-
-pub struct PoolView<'a>(pub bool, pub &'a PoolModel);
-render!(TuiOut: (self: PoolView<'a>) => {
-    let Self(compact, model) = self;
-    let PoolModel { clips, mode, .. } = self.1;
-    let color  = self.1.clip().read().unwrap().color;
-    let on_bg  = |x|Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x));
-    let border = |x|Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x);
-    on_bg(border(Map::new(||model.clips().iter(), |clip, i|{
-        let item_height = 1;
-        let item_offset = i as u16 * item_height;
-        let selected    = i == model.clip_index();
-        let MidiClip { ref name, color, length, .. } = *clip.read().unwrap();
-        let name   = if *compact { format!(" {i:>3}") } else { format!(" {i:>3} {name}") };
-        let length = if *compact { String::default()  } else { format!("{length}  ") };
-        map_south(item_offset, item_height, Tui::bg(if selected { color.light.rgb } else { color.base.rgb }, lay!(
-            Fill::x(Align::w(Tui::fg(color.lightest.rgb, Tui::bold(selected, name)))),
-            Fill::x(Align::e(Tui::fg(color.lightest.rgb, Tui::bold(selected, length)))),
-            Fill::x(Align::w(When(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "▶"))))),
-            Fill::x(Align::e(When(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "◀"))))),
-        )))
-    })))
-});