From 25a6e94b5dda23d07438f137a240184ab100de84 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 15 May 2025 04:51:10 +0300 Subject: [PATCH] groovebox: layout --- config/config_groovebox.edn | 23 +++-- crates/app/src/model.rs | 2 +- crates/app/src/view.rs | 112 ++++++++++++---------- crates/device/src/sampler/sampler_view.rs | 4 +- 4 files changed, 78 insertions(+), 63 deletions(-) diff --git a/config/config_groovebox.edn b/config/config_groovebox.edn index 2dfc1e45..5fa63e9e 100644 --- a/config/config_groovebox.edn +++ b/config/config_groovebox.edn @@ -12,14 +12,17 @@ (layer "./keys_global.edn")) (view (bsp/a :view-dialog (bsp/w :view-meters-output (bsp/e :view-meters-input - (bsp/n - (fixed/y :h-sample-detail - (bsp/e (fill/y (fixed/x 20 (align/nw :view-sample-status))) - :view-sample-viewer)) - (bsp/e + (bsp/e + (fill/y (align/n + (bsp/s :view-status-v + (bsp/s :view-editor-status :view-pool)))) + (bsp/w (fill/y (align/n - (bsp/s :view-status-v - (bsp/s :view-midi-ports-status :view-audio-ports-status)))) - (bsp/w - (bsp/s :view-editor-status :view-pool) - (bsp/e :view-samples-keys :view-editor)))))))) + (bsp/s :view-midi-ins-status + (bsp/s :view-midi-outs-status + (bsp/s :view-audio-ins-status :view-audio-outs-status))))) + (bsp/n + (fixed/y :h-sample-detail + (bsp/e (fill/y (fixed/x 20 (align/nw :view-sample-status))) + :view-sample-viewer)) + (bsp/e :view-samples-keys :view-editor)))))))) diff --git a/crates/app/src/model.rs b/crates/app/src/model.rs index 9315a26f..9696e698 100644 --- a/crates/app/src/model.rs +++ b/crates/app/src/model.rs @@ -190,7 +190,7 @@ impl App { self.project.w_sidebar(self.editor.is_some()) } fn h_sample_detail (&self) -> u16 { - 4.max(self.height() as u16 * 3 / 9) + 6.max(self.height() as u16 * 3 / 9) } fn focus_editor (&self) -> bool { self.is_editing() diff --git a/crates/app/src/view.rs b/crates/app/src/view.rs index 2d347a3b..1f617606 100644 --- a/crates/app/src/view.rs +++ b/crates/app/src/view.rs @@ -19,30 +19,31 @@ impl App { let cache = self.view_cache.read().unwrap(); let theme = self.color; let playing = self.clock().is_rolling(); - Tui::bg(theme.darkest.rgb, Fixed::xy(20, 6, col!( - Fill::x(Align::w(Bsp::e( - Align::w(Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) }, - Either::new(false, // TODO - Thunk::new(move||Fixed::x(9, Either::new(playing, - Tui::fg(Rgb(0, 255, 0), " PLAYING "), - Tui::fg(Rgb(255, 128, 0), " STOPPED "))) - ), - Thunk::new(move||Fixed::x(5, Either::new(playing, - Tui::fg(Rgb(0, 255, 0), Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)), - Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",)))) + Tui::bg(theme.darkest.rgb, Fixed::xy(20, 6, Outer(true, Style::default().fg(Tui::g(96))).enclose( + col!( + Fill::x(Align::w(Bsp::e( + Align::w(Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) }, + Either::new(false, // TODO + Thunk::new(move||Fixed::x(9, Either::new(playing, + Tui::fg(Rgb(0, 255, 0), " PLAYING "), + Tui::fg(Rgb(255, 128, 0), " STOPPED "))) + ), + Thunk::new(move||Fixed::x(5, Either::new(playing, + Tui::fg(Rgb(0, 255, 0), Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)), + Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",)))) + ) ) - ) - )), - Bsp::s( - FieldH(theme, "Beat", cache.beat.view.clone()), - FieldH(theme, "Time", cache.time.view.clone()), - ), - ))), - Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))), - Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))), - Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))), - Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))), - ))) + )), + Bsp::s( + FieldH(theme, "Beat", cache.beat.view.clone()), + FieldH(theme, "Time", cache.time.view.clone()), + ), + ))), + Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))), + Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))), + Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))), + Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))), + )))) } pub fn view_status (&self) -> impl Content + use<'_> { self.update_clock(); @@ -62,32 +63,43 @@ impl App { pub fn view_editor_status (&self) -> impl Content + use<'_> { self.editor().map(|e|Bsp::s(e.clip_status(), e.edit_status())) } - pub fn view_midi_ports_status (&self) -> impl Content + use<'_> { - self.project.get_track().map(|track|Bsp::s( - Fixed::xy(20, 1 + track.sequencer.midi_ins.len() as u16, FieldV(self.color, - format!("MIDI ins: "), - Map::south(1, ||track.sequencer.midi_ins.iter(), - |port, index|Fill::x(Align::w(format!(" {index} {}", port.name())))))), - Fixed::xy(20, 1 + track.sequencer.midi_outs.len() as u16, FieldV( - self.color, - format!("MIDI outs: "), - Map::south(1, ||track.sequencer.midi_outs.iter(), - |port, index|Fill::x(Align::w(format!(" {index} {}", port.name())))))) - )) + pub fn view_midi_ins_status (&self) -> impl Content + use<'_> { + self.project.get_track().map(|track|{ + let ins = track.sequencer.midi_ins.len() as u16; + Fixed::xy(20, 1 + ins, Outer(true, Style::default().fg(Tui::g(96))).enclose( + Fixed::xy(20, 1 + ins, FieldV(self.color, format!("MIDI ins: "), + Map::south(1, ||track.sequencer.midi_ins.iter(), + |port, index|Fill::x(Align::w(format!(" {index} {}", port.name())))))))) + }) } - pub fn view_audio_ports_status (&self) -> impl Content + use<'_> { - self.project.get_track().map(|track|Bsp::s( - track.devices.get(0).map(|device| - Fixed::xy(20, 1 + device.audio_ins().len() as u16, FieldV(self.color, - format!("Audio ins: "), - Map::south(1, ||device.audio_ins().iter(), - |port, index|Fill::x(Align::w(format!(" {index} {}", port.name()))))))), - track.devices.last().map(|device| - Fixed::xy(20, 1 + device.audio_outs().len() as u16, FieldV(self.color, - format!("Audio outs:"), - Map::south(1, ||device.audio_outs().iter(), - |port, index|Fill::x(Align::w(format!(" {index} {}", port.name()))))))), - )) + pub fn view_midi_outs_status (&self) -> impl Content + use<'_> { + self.project.get_track().map(|track|{ + let outs = track.sequencer.midi_outs.len() as u16; + Fixed::xy(20, 1 + outs, Outer(true, Style::default().fg(Tui::g(96))).enclose( + Fixed::xy(20, 1 + outs, FieldV(self.color, format!("MIDI outs: "), + Map::south(1, ||track.sequencer.midi_outs.iter(), + |port, index|Fill::x(Align::w(format!(" {index} {}", port.name())))))))) + }) + } + pub fn view_audio_ins_status (&self) -> impl Content + use<'_> { + self.project.get_track() + .and_then(|track|track.devices.get(0)) + .map(|device|{ + let ins = device.audio_ins().len() as u16; + Fixed::xy(20, 1 + ins, Outer(true, Style::default().fg(Tui::g(96))).enclose( + Fixed::xy(20, 1 + ins, FieldV(self.color, format!("Audio ins: "), + Map::south(1, ||device.audio_ins().iter(), + |port, index|Fill::x(Align::w(format!(" {index} {}", port.name()))))))))}) + } + pub fn view_audio_outs_status (&self) -> impl Content + use<'_> { + self.project.get_track() + .and_then(|track|track.devices.last()) + .map(|device|{ + let outs = device.audio_outs().len() as u16; + Fixed::xy(20, 1 + outs, Outer(true, Style::default().fg(Tui::g(96))).enclose( + Fixed::xy(20, 1 + outs, FieldV(self.color, format!("Audio outs: "), + Map::south(1, ||device.audio_outs().iter(), + |port, index|Fill::x(Align::w(format!(" {index} {}", port.name()))))))))}) } pub fn view_arranger (&self) -> impl Content + use<'_> { ArrangerView::new(&self.project, self.editor.as_ref()) @@ -218,8 +230,8 @@ impl App { pub fn view_pool (&self) -> impl Content + use<'_> { Fixed::x(20, Bsp::s( Fill::x(Align::w(FieldH(self.color, "Clip pool:", ""))), - Fill::y(Align::n(Tui::bg(Rgb(0, 0, 0), PoolView(&self.project.pool)))), - )) + Fill::y(Align::n(Tui::bg(Rgb(0, 0, 0), Outer(true, Style::default().fg(Tui::g(96))) + .enclose(PoolView(&self.project.pool))))))) } pub fn view_samples_keys (&self) -> impl Content + use<'_> { self.project.sampler().map(|s|s.view_list(true, self.editor().unwrap())) diff --git a/crates/device/src/sampler/sampler_view.rs b/crates/device/src/sampler/sampler_view.rs index 7b21233d..bfb344ff 100644 --- a/crates/device/src/sampler/sampler_view.rs +++ b/crates/device/src/sampler/sampler_view.rs @@ -119,13 +119,13 @@ impl Sampler { } pub fn view_sample_status (&self, note_pt: usize) -> impl Content + use<'_> { - Fixed::x(20, draw_info_v(if let Some((_, sample)) = &self.recording { + Fixed::x(20, Outer(true, Style::default().fg(Tui::g(96))).enclose(draw_info_v(if let Some((_, sample)) = &self.recording { Some(sample) } else if let Some(sample) = &self.mapped[note_pt] { Some(sample) } else { None - })) + }))) } pub fn view_status (&self, index: usize) -> impl Content {