diff --git a/README.md b/README.md index 4b2d0fc6..c927ac6f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # tek +[![Please don't upload to GitHub](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page) + a music making program for your terminal ## project status diff --git a/crates/tek_core/src/command.rs b/crates/tek_core/src/command.rs index 22100bde..aa9969f2 100644 --- a/crates/tek_core/src/command.rs +++ b/crates/tek_core/src/command.rs @@ -20,14 +20,14 @@ impl> MenuBar { pub struct Menu> { pub title: String, pub items: Vec>, - pub index: usize, + pub index: Option, } impl> Menu { pub fn new (title: impl AsRef) -> Self { Self { title: title.as_ref().to_string(), items: vec![], - index: 0 + index: None, } } pub fn add (mut self, item: MenuItem) -> Self { diff --git a/crates/tek_sequencer/src/arranger.rs b/crates/tek_sequencer/src/arranger.rs index 38ca36a1..a9420955 100644 --- a/crates/tek_sequencer/src/arranger.rs +++ b/crates/tek_sequencer/src/arranger.rs @@ -131,7 +131,7 @@ impl Arranger { jack: jack.clone(), focus_cursor: (0, 1), phrases_split: 20, - arrangement_split: 21, + arrangement_split: 15, editor: PhraseEditor::new(), status: ArrangerStatusBar::ArrangementClip, transport: transport.clone(), diff --git a/crates/tek_sequencer/src/arranger_tui.rs b/crates/tek_sequencer/src/arranger_tui.rs index 934cf7fb..41139e1d 100644 --- a/crates/tek_sequencer/src/arranger_tui.rs +++ b/crates/tek_sequencer/src/arranger_tui.rs @@ -5,17 +5,23 @@ impl Content for Arranger { fn content (&self) -> impl Widget { Split::down( 1, - widget(&self.transport), + row!(menu in self.menu.menus.iter() => { + row!(" ", menu.title.as_str(), " ") + }), Split::up( 1, widget(&self.status), - Split::down( - self.arrangement_split, - widget(&self.arrangement), - Split::right( - self.phrases_split, - self.phrases.clone(), - widget(&self.editor), + Split::up( + 1, + widget(&self.transport), + Split::down( + self.arrangement_split, + widget(&self.arrangement), + Split::right( + self.phrases_split, + self.phrases.clone(), + widget(&self.editor), + ) ) ) )