unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-06 19:56:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: midi import/export browser, pt.3

Browse source
This commit is contained in:
🪞👃🪞 2024-11-24 19:23:56 +01:00
parent fab6113478
commit a4febb8a0d
3 changed files with 49 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/tek_tui/src/tui_command.rs
View file

@ -258,7 +258,8 @@ pub enum FileBrowserCommand {
Cancel, Cancel,
Confirm, Confirm,
Select(usize), Select(usize),
Chdir(PathBuf) Chdir(PathBuf),
Filter(String),
} }
impl<T: PhrasesControl> Command<T> for FileBrowserCommand { impl<T: PhrasesControl> Command<T> for FileBrowserCommand {

72
crates/tek_tui/src/tui_content.rs
View file

@ -130,35 +130,46 @@ impl<'a, T: PhrasesViewState> Content for PhrasesView<'a, T> {
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {
let focused = self.0.phrases_focused(); let focused = self.0.phrases_focused();
let entered = self.0.phrases_entered(); let entered = self.0.phrases_entered();
let phrases = self.0.phrases(); let mode = self.0.phrases_mode();
let selected_phrase = self.0.phrase_index(); let content = Stack::down(move|add|match mode {
let mode = self.0.phrase_mode(); Some(PhrasesMode::Import(index, ref browser)) => {
let content = col!( add(browser)
(i, phrase) in phrases.iter().enumerate() => Layers::new(|add|{ },
let Phrase { ref name, color, length, .. } = *phrase.read().unwrap(); Some(PhrasesMode::Export(index, ref browser)) => {
let mut length = PhraseLength::new(length, None); add(browser)
if let Some(PhrasesMode::Length(phrase, new_length, focus)) = mode { },
if focused && i == *phrase { _ => {
length.pulses = *new_length; let phrases = self.0.phrases();
length.focus = Some(*focus); let selected = self.0.phrase_index();
} for (i, phrase) in phrases.iter().enumerate() {
} add(&Layers::new(|add|{
let length = length.align_e().fill_x(); let Phrase { ref name, color, length, .. } = *phrase.read().unwrap();
let row1 = lay!(format!(" {i}").align_w().fill_x(), length).fill_x(); let mut length = PhraseLength::new(length, None);
let mut row2 = format!(" {name}"); if let Some(PhrasesMode::Length(phrase, new_length, focus)) = mode {
if let Some(PhrasesMode::Rename(phrase, _)) = mode { if focused && i == *phrase {
if focused && i == *phrase { length.pulses = *new_length;
row2 = format!("{row2}▄"); length.focus = Some(*focus);
} }
}; }
let row2 = TuiStyle::bold(row2, true); let length = length.align_e().fill_x();
add(&col!(row1, row2).fill_x().bg(color.base.rgb))?; let row1 = lay!(format!(" {i}").align_w().fill_x(), length).fill_x();
if focused && i == selected_phrase { let mut row2 = format!(" {name}");
add(&CORNERS)?; if let Some(PhrasesMode::Rename(phrase, _)) = mode {
if focused && i == *phrase {
row2 = format!("{row2}▄");
}
};
let row2 = TuiStyle::bold(row2, true);
add(&col!(row1, row2).fill_x().bg(color.base.rgb))?;
if focused && i == selected {
add(&CORNERS)?;
}
Ok(())
}))?;
} }
Ok(()) Ok(())
}) }
); });
let border_color = if focused {Color::Rgb(100, 110, 40)} else {Color::Rgb(70, 80, 50)}; let border_color = if focused {Color::Rgb(100, 110, 40)} else {Color::Rgb(70, 80, 50)};
let border = Lozenge(Style::default().bg(Color::Rgb(40, 50, 30)).fg(border_color)); let border = Lozenge(Style::default().bg(Color::Rgb(40, 50, 30)).fg(border_color));
let content = content.fill_xy().bg(Color::Rgb(28, 35, 25)).border(border); let content = content.fill_xy().bg(Color::Rgb(28, 35, 25)).border(border);
@ -173,6 +184,13 @@ impl<'a, T: PhrasesViewState> Content for PhrasesView<'a, T> {
} }
} }
impl Content for FileBrowser {
type Engine = Tui;
fn content (&self) -> impl Widget<Engine = Tui> {
"todo: file browser"
}
}
impl<'a, T: PhraseViewState> Content for PhraseView<'a, T> { impl<'a, T: PhraseViewState> Content for PhraseView<'a, T> {
type Engine = Tui; type Engine = Tui;
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {

4
crates/tek_tui/src/tui_view.rs
View file

@ -66,7 +66,7 @@ pub trait PhrasesViewState: Send + Sync {
fn phrases_entered (&self) -> bool; fn phrases_entered (&self) -> bool;
fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>>; fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>>;
fn phrase_index (&self) -> usize; fn phrase_index (&self) -> usize;
fn phrase_mode (&self) -> &Option<PhrasesMode>; fn phrases_mode (&self) -> &Option<PhrasesMode>;
} }
macro_rules! impl_phrases_view_state { macro_rules! impl_phrases_view_state {
($Struct:ident $(:: $field:ident)* [$self1:ident: $focus:expr] [$self2:ident: $enter:expr]) => { ($Struct:ident $(:: $field:ident)* [$self1:ident: $focus:expr] [$self2:ident: $enter:expr]) => {
@ -83,7 +83,7 @@ macro_rules! impl_phrases_view_state {
fn phrase_index (&self) -> usize { fn phrase_index (&self) -> usize {
self$(.$field)*.phrase.load(Ordering::Relaxed) self$(.$field)*.phrase.load(Ordering::Relaxed)
} }
fn phrase_mode (&self) -> &Option<PhrasesMode> { fn phrases_mode (&self) -> &Option<PhrasesMode> {
&self$(.$field)*.mode &self$(.$field)*.mode
} }
} }