make horizontal space for editor

tek/src/arranger/arranger_tui.rs

@@ -160,73 +160,86 @@ impl Arranger {
             ))).boxed()
         }).into()
     }
-    fn scene_row_cells <'a> (&'a self) -> BoxThunk<'a, TuiOut> {
-        let editing = self.editing;
-        (move||Fixed::y(2, Map::new(||self.tracks_with_widths(), move|(_, track, x1, x2), t| {
-            let w = (x2 - x1) as u16;
-            let cell = Bsp::s("[Rec]", "[Mon]");
-            let color: ItemPalette = track.color().dark.into();
-            let last_color = Arc::new(RwLock::new(ItemPalette::from(Color::Rgb(0, 0, 0))));
-            let (selected_track, selected_scene) = match self.selected {
-                ArrangerSelection::Clip(t, s) => (Some(t), Some(s)),
-                _ => (None, None)
-            };
-            map_east(x1 as u16, w, Fixed::x(w, Tui::bg(Color::Rgb(0,0,0), Fill::y(Map::new(
-                ||self.scenes_with_heights(2),
-                move|(_, scene, y1, y2), s| {
-                    let h     = (y2 - y1) as u16;
-                    let color = scene.color();
-                    let name  = "⏹ ";
-                    let last  = last_color.read().unwrap().clone();
-                    //let cell  = phat_sel_3(
-                        //selected_track == Some(i) && selected_scene == Some(j),
-                        //Tui::fg(TuiTheme::g(64), Push::x(1, name)),
-                        //Tui::fg(TuiTheme::g(64), Push::x(1, name)),
-                        //if selected_track == Some(i) && selected_scene.map(|s|s+1) == Some(j) {
-                            //None
-                        //} else {
-                            //Some(TuiTheme::g(32).into())
-                        //},
-                        //TuiTheme::g(32).into(),
-                        //TuiTheme::g(32).into(),
-                    //);
-                    let active = editing && selected_track == Some(t) && selected_scene == Some(s);
-                    let editor = Thunk::new(||&self.editor);
-                    let cell   = Thunk::new(move||phat_sel_3(
-                        selected_track == Some(t) && selected_scene == Some(s),
-                        Tui::fg(TuiTheme::g(64), Push::x(1, Tui::bold(true, name.to_string()))),
-                        Tui::fg(TuiTheme::g(64), Push::x(1, Tui::bold(true, name.to_string()))),
-                        if selected_track == Some(t) && selected_scene.map(|s|s+1) == Some(s) {
-                            None
-                        } else {
-                            Some(TuiTheme::g(32).into())
-                        },
-                        TuiTheme::g(32).into(),
-                        TuiTheme::g(32).into(),
-                    ));
-                    let cell = Either(active, editor, cell);
-                    map_south(y1 as u16, h + 1, Fill::x(cell))
-                }
-            ))).boxed()
-        ))
-        })).boxed()).into()
-    }
-
     pub fn tracks_with_widths (&self)
         -> impl Iterator<Item = (usize, &ArrangerTrack, usize, usize)>
     {
-        Self::tracks_with_widths_static(self.tracks.as_slice())
+        let active = match self.selected {
+            ArrangerSelection::Track(t)   => Some(t),
+            ArrangerSelection::Clip(t, _) => Some(t),
+            _ => None
+        };
+        Self::tracks_with_widths_static(self.tracks.as_slice(), active)
     }
-    fn tracks_with_widths_static (tracks: &[ArrangerTrack])
+    fn tracks_with_widths_static (tracks: &[ArrangerTrack], active: Option<usize>)
         -> impl Iterator<Item = (usize, &ArrangerTrack, usize, usize)>
     {
         let mut x = 0;
         tracks.iter().enumerate().map(move |(index, track)|{
-            let data = (index, track, x, x + track.width);
+            let width = if Some(index) == active { 40 } else { track.width };
-            x += track.width;
+            let data = (index, track, x, x + width);
+            x += width;
             data
         })
     }
+    fn scene_row_cells <'a> (&'a self) -> BoxThunk<'a, TuiOut> {
+        let editing = self.editing;
+        let (selected_track, selected_scene) = match self.selected {
+            ArrangerSelection::Clip(t, s) => (Some(t), Some(s)),
+            _ => (None, None)
+        };
+        let tracks  = move||self.tracks_with_widths();
+        let scenes  = ||self.scenes_with_heights(2);
+        (move||Fixed::y(2, Map::new(tracks, move|(_, track, x1, x2), t| {
+            let w = (x2 - x1) as u16;
+            let cell = Bsp::s("[Rec]", "[Mon]");
+            let color: ItemPalette = track.color().dark.into();
+            let last_color = Arc::new(RwLock::new(ItemPalette::from(Color::Rgb(0, 0, 0))));
+            let cells = Map::new(scenes, move|(_, scene, y1, y2), s| {
+                let h     = (y2 - y1) as u16;
+                let color = scene.color();
+                let name  = "⏹ ";
+                let last  = last_color.read().unwrap().clone();
+                //let cell  = phat_sel_3(
+                    //selected_track == Some(i) && selected_scene == Some(j),
+                    //Tui::fg(TuiTheme::g(64), Push::x(1, name)),
+                    //Tui::fg(TuiTheme::g(64), Push::x(1, name)),
+                    //if selected_track == Some(i) && selected_scene.map(|s|s+1) == Some(j) {
+                        //None
+                    //} else {
+                        //Some(TuiTheme::g(32).into())
+                    //},
+                    //TuiTheme::g(32).into(),
+                    //TuiTheme::g(32).into(),
+                //);
+                let active = editing && selected_track == Some(t) && selected_scene == Some(s);
+                let editor = Thunk::new(||&self.editor);
+                let cell   = Thunk::new(move||phat_sel_3(
+                    selected_track == Some(t) && selected_scene == Some(s),
+                    Tui::fg(TuiTheme::g(64), Push::x(1, Tui::bold(true, name.to_string()))),
+                    Tui::fg(TuiTheme::g(64), Push::x(1, Tui::bold(true, name.to_string()))),
+                    if selected_track == Some(t) && selected_scene.map(|s|s+1) == Some(s) {
+                        None
+                    } else {
+                        Some(TuiTheme::g(32).into())
+                    },
+                    TuiTheme::g(32).into(),
+                    TuiTheme::g(32).into(),
+                ));
+                let cell = Either(active, editor, cell);
+                map_south(
+                    y1 as u16,
+                    h + 1,
+                    Fill::x(cell)
+                )
+            });
+            map_east(
+                x1 as u16,
+                w,
+                Fixed::x(w, Tui::bg(Color::Rgb(0,0,0), Fill::y(cells)).boxed())
+            )
+        })).boxed()).into()
+    }
+
     fn track_column_separators <'a> (&'a self) -> impl Content<TuiOut> + 'a {
         let scenes_w = 16;//.max(SCENES_W_OFFSET + ArrangerScene::longest_name(&self.scenes) as u16);
         let fg = Color::Rgb(64,64,64);
@@ -291,7 +304,7 @@ impl Arranger {
         let name = Tui::fg_bg(scene.color.lightest.rgb, scene.color.base.rgb,
             Expand::x(1, Tui::bold(true, scene.name.clone()))
         );
-        let clips = Map::new(||Arranger::tracks_with_widths_static(tracks), move|(index, track, x1, x2), _|
+        let clips = Map::new(||Arranger::tracks_with_widths_static(tracks, None), move|(index, track, x1, x2), _|
             Push::x((x2 - x1) as u16, Self::cell_clip(scene, index, track, (x2 - x1) as u16, height))
         );
         Fixed::y(height, Bsp::e(icon, Bsp::e(name, clips)))