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

groovebox: fix alignment

Browse source
This commit is contained in:
🪞👃🪞 2025-04-26 15:03:58 +03:00
parent d88f4e33eb
commit 0f9cb1437f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ view!(TuiOut: |self: Tek| self.size.of(View(self, self.view)); {
ArrangerView::new(self).boxed(), ArrangerView::new(self).boxed(),
":editor" => ":editor" =>
self.editor.as_ref() self.editor.as_ref()
.map(|e|Bsp::s(Bsp::e(e.clip_status(), e.edit_status()), e)) .map(|e|Bsp::n(Bsp::e(e.clip_status(), e.edit_status()), e))
.boxed(), .boxed(),
":sample" => ":sample" =>
().boxed(),//self.view_sample(self.is_editing()).boxed(), ().boxed(),//self.view_sample(self.is_editing()).boxed(),

7
crates/sampler/src/sampler_view.rs
View file

@ -61,10 +61,11 @@ impl Sampler {
let note_lo = editor.note_lo().load(Relaxed); let note_lo = editor.note_lo().load(Relaxed);
let note_pt = editor.note_pos(); let note_pt = editor.note_pos();
let note_hi = editor.note_hi(); let note_hi = editor.note_hi();
Fixed::x(16, Map::new( Fixed::x(16, Map::south(
1,
move||(note_lo..=note_hi).rev(), move||(note_lo..=note_hi).rev(),
move|note, i| { move|note, i| {
let offset = |a|Push::y(i as u16, Align::n(Fixed::y(1, Fill::x(a)))); //let offset = |a|Push::y(i as u16, Align::n(Fixed::y(1, Fill::x(a))));
let mut bg = if note == note_pt { Tui::g(64) } else { Color::Reset }; let mut bg = if note == note_pt { Tui::g(64) } else { Color::Reset };
let mut fg = Tui::g(160); let mut fg = Tui::g(160);
let mapped: &Option<Arc<RwLock<Sample>>> = &self.mapped[note]; let mapped: &Option<Arc<RwLock<Sample>>> = &self.mapped[note];
@ -78,7 +79,7 @@ impl Sampler {
fg = Color::Rgb(224,64,32) fg = Color::Rgb(224,64,32)
} }
} }
offset(Tui::fg_bg(fg, bg, format!("{note:3} {}", self.view_list_item(note, compact)))) Tui::fg_bg(fg, bg, format!("{note:3} {}", self.view_list_item(note, compact)))
})) }))
} }
pub fn view_list_item (&self, note: usize, compact: bool) -> String { pub fn view_list_item (&self, note: usize, compact: bool) -> String {