highlight arranger help

This commit is contained in:
🪞👃🪞 2024-10-18 16:53:24 +03:00
parent 2606381d8c
commit 0f3c777c88

View file

@ -26,14 +26,17 @@ impl Content for Arrangement<Tui> {
ArrangementViewMode::Horizontal => add(&HorizontalArranger(&self)), ArrangementViewMode::Horizontal => add(&HorizontalArranger(&self)),
ArrangementViewMode::Vertical(factor) => add(&VerticalArranger(&self, factor)) ArrangementViewMode::Vertical(factor) => add(&VerticalArranger(&self, factor))
}?; }?;
let color = if self.focused{Color::Rgb(150, 160, 90)}else{Color::Rgb(120, 130, 100)};
if self.focused { if self.focused {
let commands = "[G]et [S]et [A]dd [I]nsert [D]uplicate [E]dit [C]olor"; let commands = "[G]et [S]et [A]dd [I]nsert [D]uplicate [E]dit [C]olor";
let lower_left = Align::SW(commands.push_x(1)); let lower_left = Align::SW(TuiStyle::fg(commands, color).push_x(1));
add(&lower_left)?; add(&lower_left)?;
} }
let description = self.selected.description(&self.tracks, &self.scenes); let description = self.selected.description(&self.tracks, &self.scenes);
let lower_right = Align::SE(description.as_str().pull_x(1)); let lower_right = Align::SE(TuiStyle::fg(description.as_str(), color).pull_x(1));
add(&lower_right) add(&lower_right)?;
let upper_left = TuiStyle::fg("Session", color).push_x(1);
add(&upper_left)
}) })
} }
} }
@ -52,11 +55,10 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let tracks: &[ArrangementTrack<Tui>] = state.tracks.as_ref(); let tracks: &[ArrangementTrack<Tui>] = state.tracks.as_ref();
let scenes: &[Scene] = state.scenes.as_ref(); let scenes: &[Scene] = state.scenes.as_ref();
let offset = 3 + Scene::longest_name(scenes) as u16; let offset = 3 + Scene::longest_name(scenes) as u16;
let title_fg = if self.0.focused{Color::Rgb(150, 160, 90)}else{Color::Rgb(120, 130, 100)};
let border_fg = if self.0.focused{Color::Rgb(100, 110, 40)}else{Color::Rgb( 70, 80, 50)}; let border_fg = if self.0.focused{Color::Rgb(100, 110, 40)}else{Color::Rgb( 70, 80, 50)};
let border_bg = Color::Rgb(40, 50, 30); let border_bg = Color::Rgb(40, 50, 30);
let border = Lozenge(Style::default().bg(border_bg).fg(border_fg)); let border = Lozenge(Style::default().bg(border_bg).fg(border_fg));
let content = Layers::new(move |add|{ Layers::new(move |add|{
let rows: &[(usize, usize)] = rows.as_ref(); let rows: &[(usize, usize)] = rows.as_ref();
let cols: &[(usize, usize)] = cols.as_ref(); let cols: &[(usize, usize)] = cols.as_ref();
@ -158,11 +160,6 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let name = format!("{}", name); let name = format!("{}", name);
add(&name.as_str().push_x(1).fixed_x(w))?; add(&name.as_str().push_x(1).fixed_x(w))?;
color = (phrase as &Arc<RwLock<Phrase>>).read().unwrap().color; color = (phrase as &Arc<RwLock<Phrase>>).read().unwrap().color;
//if let Some(playing_phrase) = &track.player.phrase {
//if *playing_phrase.read().unwrap() == *phrase.read().unwrap() {
//color = COLOR_PLAYING
//}
//}
}, },
_ => {} _ => {}
}; };
@ -182,8 +179,7 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
}); });
add(&col!(track_titles, tracks_clips)) add(&col!(track_titles, tracks_clips))
}).bg(Color::Rgb(28, 35, 25)).border(border); }).bg(Color::Rgb(28, 35, 25)).border(border)
lay!(content, TuiStyle::fg("Session", title_fg).push_x(1))
} }
} }
impl<'a> Content for HorizontalArranger<'a, Tui> { impl<'a> Content for HorizontalArranger<'a, Tui> {