From 49fe3322e12055fee3734e6119554a0361e30c07 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 21 Dec 2024 20:50:48 +0100 Subject: [PATCH] add CornersOuter --- crates/tek/src/tui/app_arranger.rs | 2 +- crates/tek/src/tui/phrase_list.rs | 2 ++ crates/tek/src/tui/piano_horizontal.rs | 6 ++++-- crates/tek/src/tui/tui_border.rs | 10 ++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/crates/tek/src/tui/app_arranger.rs b/crates/tek/src/tui/app_arranger.rs index a801a569..61a43a1c 100644 --- a/crates/tek/src/tui/app_arranger.rs +++ b/crates/tek/src/tui/app_arranger.rs @@ -115,7 +115,7 @@ render!(|self: ArrangerTui|{ let arranger = ||lay!(|add|{ let color = self.color; add(&Fill::wh(Tui::bg(color.darkest.rgb, ())))?; - add(&Fill::wh(Lozenge(Style::default().fg(color.light.rgb).bg(color.darker.rgb))))?; + add(&Fill::wh(CornersOuter(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb))))?; add(&Self::render_mode(self)) }); with_size(with_status(with_editbar(with_pool(with_transport(col!([ diff --git a/crates/tek/src/tui/phrase_list.rs b/crates/tek/src/tui/phrase_list.rs index 5d211284..7f9a1b3c 100644 --- a/crates/tek/src/tui/phrase_list.rs +++ b/crates/tek/src/tui/phrase_list.rs @@ -197,7 +197,9 @@ render!(|self: PhraseListView<'a>|{ let title_color = TuiTheme::ti1(); let upper_left = "Pool:"; let upper_right = format!("({})", phrases.len()); + let color = ItemPalette::from(Color::Rgb(128,0,0)); Tui::bg(bg, lay!(move|add|{ + add(&Fill::wh(CornersOuter(Style::default().fg(color.light.rgb).bg(bg))))?; //add(&Lozenge(Style::default().bg(border_bg).fg(border_color)))?; add(&Tui::inset_xy(0, 1, Fill::wh(col!(move|add|match mode { Some(PhraseListMode::Import(_, ref file_picker)) => add(file_picker), diff --git a/crates/tek/src/tui/piano_horizontal.rs b/crates/tek/src/tui/piano_horizontal.rs index 04bd82ed..5d85cc85 100644 --- a/crates/tek/src/tui/piano_horizontal.rs +++ b/crates/tek/src/tui/piano_horizontal.rs @@ -65,13 +65,15 @@ render!(|self: PianoHorizontal|{ let notes = move||PianoHorizontalNotes(&self); let cursor = move||PianoHorizontalCursor(&self); let keys_width = 5; - Fill::wh(Bsp::s( + let border = Fill::wh(CornersOuter(Style::default().fg(self.color.dark.rgb).bg(self.color.darkest.rgb))); + let with_border = |x|lay!([border, Tui::inset_xy(1, 1, &x)]); + with_border(Fill::wh(Bsp::s( Fixed::h(1, Bsp::e(Fixed::w(keys_width, ""), Fill::w(timeline()),)), Bsp::e( Fixed::w(keys_width, keys()), Fill::wh(lay!([&self.size, Fill::wh(lay!([Fill::wh(notes()), Fill::wh(cursor()),]))])), ), - )) + ))) }); pub struct PianoHorizontalTimeline<'a>(&'a PianoHorizontal); diff --git a/crates/tek/src/tui/tui_border.rs b/crates/tek/src/tui/tui_border.rs index ae12a207..52829599 100644 --- a/crates/tek/src/tui/tui_border.rs +++ b/crates/tek/src/tui/tui_border.rs @@ -197,6 +197,16 @@ border! { "" "" "🭼" "" "🭿" fn style (&self) -> Option