From 2b087389929e80be962962d8c2d12cbe86b41c69 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 21 Dec 2024 22:48:15 +0100 Subject: [PATCH] fill editor area! --- crates/tek/src/tui/app_arranger.rs | 2 +- crates/tek/src/tui/app_transport.rs | 15 ++++++++------- crates/tek/src/tui/piano_horizontal.rs | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/crates/tek/src/tui/app_arranger.rs b/crates/tek/src/tui/app_arranger.rs index 61a43a1c..ffcaa9d6 100644 --- a/crates/tek/src/tui/app_arranger.rs +++ b/crates/tek/src/tui/app_arranger.rs @@ -120,7 +120,7 @@ render!(|self: ArrangerTui|{ }); with_size(with_status(with_editbar(with_pool(with_transport(col!([ Fill::w(Fixed::h(20, arranger())), - Fill::w(Fixed::h(25, &self.editor)), + Fill::wh(&self.editor), ])))))) }); audio!(|self: ArrangerTui, client, scope|{ diff --git a/crates/tek/src/tui/app_transport.rs b/crates/tek/src/tui/app_transport.rs index 6014a9bf..92e8eb80 100644 --- a/crates/tek/src/tui/app_transport.rs +++ b/crates/tek/src/tui/app_transport.rs @@ -83,20 +83,21 @@ render!(|self: TransportView|{ let color = self.color; struct Field<'a>(&'a str, &'a str, &'a ItemPalette); render!(|self: Field<'a>|row!([ - Tui::fg_bg(self.2.lightest.rgb, self.2.darkest.rgb, Tui::bold(true, self.0)), - Tui::fg_bg(self.2.lighter.rgb, self.2.darkest.rgb, "│"), - Tui::fg_bg(self.2.lighter.rgb, self.2.base.rgb, format!("{:>10}", self.1)), + Tui::fg_bg(self.2.lightest.rgb, self.2.base.rgb, Tui::bold(true, self.0)), + Tui::fg_bg(self.2.base.rgb, self.2.darkest.rgb, "▌"), + Tui::fg_bg(self.2.lightest.rgb, self.2.darkest.rgb, format!("{:>10}", self.1)), + Tui::fg_bg(self.2.darkest.rgb, self.2.base.rgb, "▌"), ])); Tui::bg(color.base.rgb, Fill::w(row!([ //PlayPause(self.started), " ", col!([ - Field(" Beat", self.beat.as_str(), &color), - Field(" BPM", self.bpm.as_str(), &color), + Field(" Beat", self.beat.as_str(), &color), + Field(" BPM", self.bpm.as_str(), &color), ]), " ", col!([ - Field(" Time", format!("{:.1}s", self.current_second).as_str(), &color), - Field(" Smpl", format!("{:.1}k", self.current_sample).as_str(), &color), + Field("Time", format!("{:.1}s", self.current_second).as_str(), &color), + Field("Smpl", format!("{:.1}k", self.current_sample).as_str(), &color), ]), ]))) }); diff --git a/crates/tek/src/tui/piano_horizontal.rs b/crates/tek/src/tui/piano_horizontal.rs index 5d85cc85..657fd0e5 100644 --- a/crates/tek/src/tui/piano_horizontal.rs +++ b/crates/tek/src/tui/piano_horizontal.rs @@ -241,7 +241,7 @@ impl PianoHorizontal { } let time_end = time_start + zoom; - for time in time_start..time_end { + for time in time_start..time_end.min(phrase.length) { for event in phrase.notes[time].iter() { match event { MidiMessage::NoteOn { key, .. } => {