improve ui legibility immensely right after release

This commit is contained in:
🪞👃🪞 2025-01-03 00:44:00 +01:00
parent b20ebbd7be
commit 83f840a412
5 changed files with 40 additions and 57 deletions

View file

@ -3,7 +3,7 @@ use super::*;
render!(Tui: (self: Groovebox) => self.size.of(
Bsp::s(self.toolbar_view(),
Bsp::s(self.selector_view(),
Bsp::n(self.selector_view(),
Bsp::n(self.sample_view(),
Bsp::n(self.status_view(),
Bsp::w(self.pool_view(), Fill::xy(Bsp::e(self.sampler_view(), &self.editor)))))))));
@ -16,38 +16,34 @@ impl Groovebox {
Align::x(TransportView::new(true, &self.player.clock)),
)))
}
fn status_view (&self) -> impl Content<Tui> + use<'_> {
let note_pt = self.editor.note_point();
lay!(
Align::w(Fixed::y(1, SamplerStatus(&self.sampler, note_pt))),
Align::x(Fixed::y(1, MidiEditStatus(&self.editor))),
fn selector_view (&self) -> impl Content<Tui> + use<'_> {
row!(
MidiEditClip(&self.editor),
MidiEditStatus(&self.editor),
ClipSelected::play_phrase(&self.player),
ClipSelected::next_phrase(&self.player),
)
}
fn sampler_view (&self) -> impl Content<Tui> + use<'_> {
let sampler_w = if !self.compact { 11 } else { 4 };
let sampler_y = if self.compact { 1 } else { 0 };
Fixed::x(sampler_w, Push::y(sampler_y, Fill::y(
SampleList::new(self.compact, &self.sampler, &self.editor))))
}
fn sample_view (&self) -> impl Content<Tui> + use<'_> {
let note_pt = self.editor.note_point();
let sample_h = if self.compact { 0 } else { 5 };
Max::y(sample_h, Fill::xy(
SampleViewer::from_sampler(&self.sampler, note_pt)))
}
fn status_view (&self) -> impl Content<Tui> + use<'_> {
let note_pt = self.editor.note_point();
Align::w(Fixed::y(1, SamplerStatus(&self.sampler, note_pt)))
}
fn pool_view (&self) -> impl Content<Tui> + use<'_> {
let w = self.size.w();
let pool_w = if w > 60 { 20 } else if w > 40 { 15 } else { 10 };
Fixed::x(if self.compact { 5 } else { pool_w },
PoolView(self.compact, &self.pool))
}
fn selector_view (&self) -> impl Content<Tui> + use<'_> {
lay!(
Align::w(MidiEditClip(&self.editor)),
Align::e(Bsp::e(
ClipSelected::play_phrase(&self.player),
ClipSelected::next_phrase(&self.player)
))
)
fn sampler_view (&self) -> impl Content<Tui> + use<'_> {
let sampler_w = if self.compact { 4 } else { 11 };
let sampler_y = if self.compact { 0 } else { 1 };
Fixed::x(sampler_w, Push::y(sampler_y, Fill::y(
SampleList::new(self.compact, &self.sampler, &self.editor))))
}
}