switch toolbar actions; bold borders and titles

This commit is contained in:
🪞👃🪞 2024-05-29 13:34:36 +03:00
parent 7dd5f7f488
commit 31f8ec5362
8 changed files with 103 additions and 116 deletions

View file

@ -3,7 +3,7 @@ use super::Sampler;
pub fn handle (
state: &mut Sampler,
event: crossterm::event::Event
event: &Event
) -> Result<(), Box<dyn Error>> {
use crossterm::event::{Event, KeyCode, KeyModifiers};
if let Event::Key(event) = event {

View file

@ -6,45 +6,21 @@ pub fn render (
stdout: &mut Stdout,
offset: (u16, u16),
) -> Result<(), Box<dyn Error>> {
render_toolbar(state, stdout, offset)?;
render_table(state, stdout, offset)?;
render_meters(state, stdout, offset)?;
stdout.flush()?;
Ok(())
}
fn render_toolbar (
state: &mut Sampler,
stdout: &mut Stdout,
offset: (u16, u16),
) -> Result<(), Box<dyn Error>> {
stdout
.queue(cursor::MoveTo(1, 0))?
.queue(PrintStyledContent("Arrows".yellow().bold()))?
.queue(cursor::MoveTo(1, 1))?
.queue(PrintStyledContent("Navigate".yellow()))?
.queue(cursor::MoveTo(11, 0))?
.queue(PrintStyledContent("Enter".yellow().bold()))?
.queue(cursor::MoveTo(11, 1))?
.queue(PrintStyledContent("Play sample".yellow()))?
.queue(cursor::MoveTo(24, 0))?
.queue(PrintStyledContent("Ins/Del".yellow().bold()))?
.queue(cursor::MoveTo(24, 1))?
.queue(PrintStyledContent("Add/remove sample".yellow()))?;
Ok(())
}
fn render_table (
state: &mut Sampler,
stdout: &mut Stdout,
offset: (u16, u16),
) -> Result<(), Box<dyn Error>> {
stdout
.queue(cursor::MoveTo(0, 3))?
.queue(Print(
" Name Rate Trigger Route"))?;
let move_to = |col, row| crossterm::cursor::MoveTo(offset.0 + col, offset.1 + row);
stdout.queue(move_to(0, 3))?.queue(
Print(" Name Rate Trigger Route")
)?;
for (i, sample) in state.samples.iter().enumerate() {
let row = 4 + i as u16;
for (j, (column, field)) in [
@ -53,7 +29,7 @@ fn render_table (
(18, format!(" MIDI C10 36 ")),
(33, format!(" {:.1}dB -> Output ", sample.gain)),
].into_iter().enumerate() {
stdout.queue(cursor::MoveTo(column, row))?;
stdout.queue(move_to(column, row))?;
if state.selected_sample == i && state.selected_column == j {
stdout.queue(PrintStyledContent(field.to_string().bold().reverse()))?;
} else {
@ -69,11 +45,12 @@ fn render_meters (
stdout: &mut Stdout,
offset: (u16, u16),
) -> Result<(), Box<dyn Error>> {
let move_to = |col, row| crossterm::cursor::MoveTo(offset.0 + col, offset.1 + row);
for (i, sample) in state.samples.iter().enumerate() {
let row = 4 + i as u16;
stdout
.queue(cursor::MoveTo(32, row))?
.queue(PrintStyledContent("".green()))?;
stdout.queue(move_to(32, row))?.queue(
PrintStyledContent("".green())
)?;
}
Ok(())
}