mirror of
https://codeberg.org/unspeaker/perch.git
synced 2025-12-06 17:46:42 +01:00
highlight selected column
This commit is contained in:
parent
b3a52c171b
commit
01bc1b7b47
3 changed files with 53 additions and 11 deletions
21
src/keys.rs
21
src/keys.rs
|
|
@ -1,7 +1,5 @@
|
||||||
use crate::*;
|
use crate::*;
|
||||||
|
|
||||||
const PAGE_SIZE: usize = 10;
|
|
||||||
|
|
||||||
impl Handle<TuiIn> for Taggart {
|
impl Handle<TuiIn> for Taggart {
|
||||||
fn handle (&mut self, input: &TuiIn) -> Perhaps<bool> {
|
fn handle (&mut self, input: &TuiIn) -> Perhaps<bool> {
|
||||||
let x_min = self.offset;
|
let x_min = self.offset;
|
||||||
|
|
@ -39,6 +37,22 @@ impl Handle<TuiIn> for Taggart {
|
||||||
}) => {
|
}) => {
|
||||||
self.cursor += PAGE_SIZE;
|
self.cursor += PAGE_SIZE;
|
||||||
},
|
},
|
||||||
|
Event::Key(KeyEvent {
|
||||||
|
code: KeyCode::Left,
|
||||||
|
kind: KeyEventKind::Press,
|
||||||
|
modifiers: KeyModifiers::NONE,
|
||||||
|
state: KeyEventState::NONE
|
||||||
|
}) => {
|
||||||
|
self.column = self.column.saturating_sub(1);
|
||||||
|
},
|
||||||
|
Event::Key(KeyEvent {
|
||||||
|
code: KeyCode::Right,
|
||||||
|
kind: KeyEventKind::Press,
|
||||||
|
modifiers: KeyModifiers::NONE,
|
||||||
|
state: KeyEventState::NONE
|
||||||
|
}) => {
|
||||||
|
self.column = self.column + 1;
|
||||||
|
},
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
if self.cursor < x_min {
|
if self.cursor < x_min {
|
||||||
|
|
@ -50,6 +64,9 @@ impl Handle<TuiIn> for Taggart {
|
||||||
if self.cursor >= self.paths.len() {
|
if self.cursor >= self.paths.len() {
|
||||||
self.cursor = self.paths.len().saturating_sub(1)
|
self.cursor = self.paths.len().saturating_sub(1)
|
||||||
}
|
}
|
||||||
|
if self.column + 1 > COLUMN_COUNT {
|
||||||
|
self.column = COLUMN_COUNT.saturating_sub(1)
|
||||||
|
}
|
||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,12 @@ use std::env::current_dir;
|
||||||
mod keys;
|
mod keys;
|
||||||
mod view;
|
mod view;
|
||||||
|
|
||||||
type Usually<T> = std::result::Result<T, Box<dyn std::error::Error>>;
|
pub(crate) type Usually<T> = std::result::Result<T, Box<dyn std::error::Error>>;
|
||||||
type Perhaps<T> = Usually<Option<T>>;
|
pub(crate) type Perhaps<T> = Usually<Option<T>>;
|
||||||
|
|
||||||
|
pub(crate) const PAGE_SIZE: usize = 10;
|
||||||
|
pub(crate) const COLUMN_COUNT: usize = 5;
|
||||||
|
pub(crate) const COLUMN_WIDTHS: [u16; COLUMN_COUNT] = [60, 20, 20, 5, 20];
|
||||||
|
|
||||||
fn cli () -> clap::Command {
|
fn cli () -> clap::Command {
|
||||||
command!()
|
command!()
|
||||||
|
|
|
||||||
35
src/view.rs
35
src/view.rs
|
|
@ -2,16 +2,25 @@ use crate::*;
|
||||||
use tek_tui::ratatui::{style::{Color, Style}, prelude::Stylize};
|
use tek_tui::ratatui::{style::{Color, Style}, prelude::Stylize};
|
||||||
use pad::PadStr;
|
use pad::PadStr;
|
||||||
|
|
||||||
fn table_row (label: &str, artist: &str, album: &str, title: &str) -> String {
|
|
||||||
format!("{label:60} {artist:20} {album:20} {title:20}")
|
fn table_row (label: &str, artist: &str, album: &str, track: &str, title: &str) -> String {
|
||||||
|
let label = label.pad_to_width(COLUMN_WIDTHS[0] as usize);
|
||||||
|
let artist = artist.pad_to_width(COLUMN_WIDTHS[1] as usize);
|
||||||
|
let album = album.pad_to_width(COLUMN_WIDTHS[2] as usize);
|
||||||
|
let track = track.pad_to_width(COLUMN_WIDTHS[3] as usize);
|
||||||
|
let title = title.pad_to_width(COLUMN_WIDTHS[4] as usize);
|
||||||
|
format!("{label}│{artist}╎{album}╎{track}╎{title}")
|
||||||
|
}
|
||||||
|
fn status_bar (content: impl Content<TuiOut>) -> impl Content<TuiOut> {
|
||||||
|
Fixed::y(1, Fill::x(Tui::bold(true, Tui::fg_bg(Color::Rgb(0,0,0), Color::Rgb(255,255,255), content))))
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Content<TuiOut> for Taggart {
|
impl Content<TuiOut> for Taggart {
|
||||||
fn content (&self) -> impl Render<TuiOut> {
|
fn content (&self) -> impl Render<TuiOut> {
|
||||||
let sizer = Fill::xy(&self.size);
|
let sizer = Fill::xy(&self.size);
|
||||||
let size = format!("{}x{}", self.size.w(), self.size.h());
|
let size = format!("{}x{}", self.size.w(), self.size.h());
|
||||||
let size_bar = Fill::x(Align::e(Tui::bold(true, Tui::fg_bg(Color::Rgb(0,0,0), Color::Rgb(255,255,255), size))));
|
let size_bar = status_bar(Align::e(size));
|
||||||
let titlebar = Fill::x(Align::w(Tui::bold(true, Tui::fg_bg(Color::Rgb(0,0,0), Color::Rgb(255,255,255), table_row("FILE", "ARTIST", "ALBUM", "TITLE")))));
|
let titlebar = status_bar(Align::w(table_row("FILE", "ARTIST", "RELEASE", "TRACK", "TITLE")));
|
||||||
let table = Fill::xy(TreeTable(self));
|
let table = Fill::xy(TreeTable(self));
|
||||||
Bsp::n(size_bar, Bsp::s(titlebar, Bsp::b(sizer, table)))
|
Bsp::n(size_bar, Bsp::s(titlebar, Bsp::b(sizer, table)))
|
||||||
}
|
}
|
||||||
|
|
@ -22,7 +31,17 @@ struct TreeTable<'a>(&'a Taggart);
|
||||||
impl<'a> Content<TuiOut> for TreeTable<'a> {
|
impl<'a> Content<TuiOut> for TreeTable<'a> {
|
||||||
fn render (&self, to: &mut TuiOut) {
|
fn render (&self, to: &mut TuiOut) {
|
||||||
let area = to.area();
|
let area = to.area();
|
||||||
let Taggart { offset, paths, cursor, .. } = self.0;
|
let Taggart { offset, paths, cursor, column, .. } = self.0;
|
||||||
|
let mut x = 0;
|
||||||
|
for (index, width) in COLUMN_WIDTHS.iter().enumerate() {
|
||||||
|
let w = COLUMN_WIDTHS[index] + 1;
|
||||||
|
if index == *column {
|
||||||
|
to.fill_bg([area.x() + x, area.y(), w, area.h()], Color::Rgb(0, 0, 0));
|
||||||
|
break
|
||||||
|
} else {
|
||||||
|
x += w;
|
||||||
|
}
|
||||||
|
}
|
||||||
for (i, y) in area.iter_y().enumerate() {
|
for (i, y) in area.iter_y().enumerate() {
|
||||||
let i_offset = i + offset;
|
let i_offset = i + offset;
|
||||||
let selected = *cursor == i_offset;
|
let selected = *cursor == i_offset;
|
||||||
|
|
@ -33,12 +52,14 @@ impl<'a> Content<TuiOut> for TreeTable<'a> {
|
||||||
let icon = if entry.is_dir {"+"} else {" "};
|
let icon = if entry.is_dir {"+"} else {" "};
|
||||||
let name = fragment.display();
|
let name = fragment.display();
|
||||||
let indent = "".pad_to_width((entry.depth - 1) * 2);
|
let indent = "".pad_to_width((entry.depth - 1) * 2);
|
||||||
let label = table_row(&format!("{cursor} {indent}{icon} {name}"), "", "", "");
|
let label = table_row(&format!("{cursor} {indent}{icon} {name}"), "", "", "", "");
|
||||||
to.blit(&label, area.x(), y, if entry.is_dir { None } else {
|
to.blit(&label, area.x(), y, if entry.is_dir { None } else {
|
||||||
Some(Style::default().bold())
|
Some(Style::default().bold())
|
||||||
});
|
});
|
||||||
if selected {
|
if selected {
|
||||||
to.fill_bg([area.x(), y, area.w(), 1], Color::Rgb(0, 0, 0));
|
let fill = [area.x(), y, area.w(), 1];
|
||||||
|
to.fill_bg(fill, Color::Rgb(48, 48, 48));
|
||||||
|
to.fill_fg(fill, Color::Rgb(224, 192, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue