unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compact sample list

Browse source
This commit is contained in:
🪞👃🪞 2025-05-14 20:44:25 +03:00
parent d45bd2122e
commit 4a9e9132f3
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/app/src/view.rs
View file

@ -87,7 +87,7 @@ impl App {
)) ))
} }
pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> { pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_list(false, self.editor().unwrap())) self.project.sampler().map(|s|s.view_list(true, self.editor().unwrap()))
} }
pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> { pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_grid()) self.project.sampler().map(|s|s.view_grid())

2
crates/device/src/pool/pool_view.rs
View file

@ -8,7 +8,7 @@ content!(TuiOut: |self: PoolView<'a>| {
//let on_bg = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x)); //let on_bg = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x));
//let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x); //let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x);
let height = pool.clips.read().unwrap().len() as u16; let height = pool.clips.read().unwrap().len() as u16;
Fixed::x(20, Fill::y(Align::c(Map::new( Fixed::x(20, Fill::y(Align::n(Map::new(
||pool.clips().clone().into_iter(), ||pool.clips().clone().into_iter(),
move|clip: Arc<RwLock<MidiClip>>, i: usize|{ move|clip: Arc<RwLock<MidiClip>>, i: usize|{
let item_height = 1; let item_height = 1;

10
crates/device/src/sampler/sampler_view.rs
View file

@ -59,7 +59,7 @@ impl Sampler {
let note_lo = editor.get_note_lo(); let note_lo = editor.get_note_lo();
let note_pt = editor.get_note_pos(); let note_pt = editor.get_note_pos();
let note_hi = editor.get_note_hi(); let note_hi = editor.get_note_hi();
Fixed::x(12, Map::south( Fixed::x(if compact { 4 } else { 12 }, Map::south(
1, 1,
move||(note_lo..=note_hi).rev(), move||(note_lo..=note_hi).rev(),
move|note, _index| { move|note, _index| {
@ -234,7 +234,7 @@ fn draw_info (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + us
} }
fn draw_info_v (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + use<'_> { fn draw_info_v (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + use<'_> {
When(sample.is_some(), Thunk::new(move||{ Either(sample.is_some(), Thunk::new(move||{
let sample = sample.unwrap().read().unwrap(); let sample = sample.unwrap().read().unwrap();
let theme = sample.color; let theme = sample.color;
Fixed::x(20, col!( Fixed::x(20, col!(
@ -245,7 +245,11 @@ fn draw_info_v (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
Fill::x(Align::w(FieldH(theme, "Trans ", "0 "))), Fill::x(Align::w(FieldH(theme, "Trans ", "0 "))),
Fill::x(Align::w(FieldH(theme, "Gain ", format!("{}", sample.gain)))), Fill::x(Align::w(FieldH(theme, "Gain ", format!("{}", sample.gain)))),
)) ))
})) }), Thunk::new(move||Tui::fg(Red, col!(
"× No sample.",
"Press record",
"or import.",
))))
} }
fn draw_status (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> { fn draw_status (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> {