From 357efeea3e4b53d967413e328a8616c52f9231a0 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Tue, 28 Jan 2025 16:34:15 +0100 Subject: [PATCH] nicer scrollbar and status bar --- tek/src/model_select.rs | 2 +- tek/src/view_clock.rs | 2 +- tek/src/view_scene.rs | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tek/src/model_select.rs b/tek/src/model_select.rs index dfbb881e..f35a0d42 100644 --- a/tek/src/model_select.rs +++ b/tek/src/model_select.rs @@ -29,7 +29,7 @@ impl Selection { match self { Clip(_, s) => Some(*s), Scene(s) => Some(*s), _ => None } } pub fn describe (&self, tracks: &[Track], scenes: &[Scene]) -> Arc { - format!("Selected: {}", match self { + format!("{}", match self { Self::Mix => "Everything".to_string(), Self::Track(t) => tracks.get(*t).map(|track|format!("T{t}: {}", &track.name)) .unwrap_or_else(||"T??".into()), diff --git a/tek/src/view_clock.rs b/tek/src/view_clock.rs index 8bdc28e6..202bd0cb 100644 --- a/tek/src/view_clock.rs +++ b/tek/src/view_clock.rs @@ -64,7 +64,7 @@ impl Tek { let theme = ItemPalette::G[96]; let fmtd = self.fmtd.read().unwrap(); Tui::bg(Black, row!(Bsp::a( - Fill::xy(Align::w(FieldH(theme, "Sel", self.selected.describe(&self.tracks, &self.scenes)))), + Fill::xy(Align::w(FieldH(theme, "Selected", self.selected.describe(&self.tracks, &self.scenes)))), Fill::xy(Align::e(row!( FieldH(theme, "SR", fmtd.sr.view.clone()), FieldH(theme, "Buf", fmtd.buf.view.clone()), diff --git a/tek/src/view_scene.rs b/tek/src/view_scene.rs index e1c39be2..5bf04e7c 100644 --- a/tek/src/view_scene.rs +++ b/tek/src/view_scene.rs @@ -23,14 +23,13 @@ impl Tek { Bsp::n(Tui::fg_bg(Rgb(255,255,255), Rgb(0,0,0),"▼"), Bsp::a( Fill::y(Align::nw(Fixed::xy(1, 1, Tui::fg(Rgb(255,255,255), "┃")))), Fill::y(Fixed::x(1, Tui::fg(Rgb(0,0,0), RepeatV("┊")))), - ))) - } + ))) } fn track_scrollbar (&self) -> impl Content + use<'_> { - Bsp::e("◀", Bsp::w("▶", Bsp::a( - Fill::x(Align::nw(Fixed::xy(1, 1, Tui::fg(Rgb(255,255,255), "━")))), - Fill::x(Fixed::y(1, Tui::fg(Rgb(0,0,0), RepeatH("┈")))), - ))) - } + Bsp::e(Tui::fg_bg(Rgb(255,255,255), Rgb(0,0,0), "🞀"), + Bsp::w(Tui::fg_bg(Rgb(255,255,255), Rgb(0,0,0), "🞂"), Bsp::a( + Fill::x(Align::nw(Fixed::xy(1, 1, Tui::fg(Rgb(255,255,255), "━")))), + Fill::x(Fixed::y(1, Tui::fg(Rgb(0,0,0), RepeatH("┈")))), + ))) } pub fn view_scenes (&self) -> impl Content + use<'_> { let w_full = self.w(); let w = self.w_tracks_area();