From 57b418b5670a6e20696b55507bd365cc4a88f082 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 23 Mar 2025 23:23:22 +0200 Subject: [PATCH] add column title to value bar --- src/model/column.rs | 16 ++++++++-------- src/view.rs | 7 ++++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/model/column.rs b/src/model/column.rs index 78e1014..2c67dd3 100644 --- a/src/model/column.rs +++ b/src/model/column.rs @@ -48,14 +48,14 @@ macro_rules! setter { impl Default for ColumnsOption>, fn(&mut [Entry], usize, &str)> { fn default () -> Self { Self(vec![ - Column::new(&"HASH", 8, |entry: &Entry|entry.hash()), - Column::new(&"SIZE", 8, |entry: &Entry|entry.size()), - Column::new(&"FILE", 80, |entry: &Entry|entry.name()), - Column::new(&"ARTIST", 30, |entry: &Entry|entry.artist()).setter(setter!(set_artist)), - Column::new(&"YEAR", 5, |entry: &Entry|entry.year()).setter(setter!(set_year)), - Column::new(&"RELEASE", 30, |entry: &Entry|entry.album()).setter(setter!(set_album)), - Column::new(&"TRACK", 5, |entry: &Entry|entry.track()).setter(setter!(set_track)), - Column::new(&"TITLE", 80, |entry: &Entry|entry.title()).setter(setter!(set_title)), + Column::new(&"Hash", 8, |entry: &Entry|entry.hash()), + Column::new(&"Size", 8, |entry: &Entry|entry.size()), + Column::new(&"File", 80, |entry: &Entry|entry.name()), + Column::new(&"Artist", 30, |entry: &Entry|entry.artist()).setter(setter!(set_artist)), + Column::new(&"Year", 5, |entry: &Entry|entry.year()).setter(setter!(set_year)), + Column::new(&"Release", 30, |entry: &Entry|entry.album()).setter(setter!(set_album)), + Column::new(&"Track", 5, |entry: &Entry|entry.track()).setter(setter!(set_track)), + Column::new(&"Title", 80, |entry: &Entry|entry.title()).setter(setter!(set_title)), ]) } } diff --git a/src/view.rs b/src/view.rs index 22a99be..54871c9 100644 --- a/src/view.rs +++ b/src/view.rs @@ -23,7 +23,12 @@ impl Content for Taggart { let value_bar = status_bar( Color::Rgb(192, 192, 192), Color::Rgb(0, 0, 0), - Fill::x(Align::w(format!(" {}/{} ", self.cursor + 1, self.entries.len()))) + Fill::x(Align::w(format!( + " {}/{} {}:", + self.cursor + 1, + self.entries.len(), + self.columns.0[self.column].title + ))) ); let mode_bar = status_bar( Color::Rgb(0, 0, 0),