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

wip: refactor pt.13: 146 errors

Browse source
This commit is contained in:
🪞👃🪞 2024-11-10 23:12:20 +01:00
parent 2be7aee002
commit fbf217e108
6 changed files with 201 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/tek_tui/src/tui_arranger_ver.rs
View file

@ -10,12 +10,12 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let tracks = state.tracks.as_ref() as &[ArrangementTrack];
let scenes = state.scenes.as_ref();
let cols = state.track_widths();
let rows = Scene::ppqs(scenes, *factor);
let rows = ArrangementScene::ppqs(scenes, *factor);
let bg = state.color;
let clip_bg = Arranger::<Tui>::border_bg();
let sep_fg = Arranger::<Tui>::separator_fg(false);
let clip_bg = TuiTheme::border_bg();
let sep_fg = TuiTheme::separator_fg(false);
let header_h = 3u16;//5u16;
let scenes_w = 3 + Scene::longest_name(scenes) as u16; // x of 1st track
let scenes_w = 3 + ArrangementScene::longest_name(scenes) as u16; // x of 1st track
let clock = &self.0.clock;
let arrangement = Layers::new(move |add|{
let rows: &[(usize, usize)] = rows.as_ref();
@ -155,17 +155,23 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let mut scene_area: Option<[u16;4]> = None;
let mut clip_area: Option<[u16;4]> = None;
let area = match selected {
ArrangementFocus::Mix => area,
ArrangementFocus::Track(t) => { track_area = Some(get_track_area(t)); area },
ArrangementFocus::Scene(s) => { scene_area = Some(get_scene_area(s)); area },
ArrangementFocus::Clip(t, s) => {
ArrangementEditorFocus::Mix => area,
ArrangementEditorFocus::Track(t) => {
track_area = Some(get_track_area(t));
area
},
ArrangementEditorFocus::Scene(s) => {
scene_area = Some(get_scene_area(s));
area
},
ArrangementEditorFocus::Clip(t, s) => {
track_area = Some(get_track_area(t));
scene_area = Some(get_scene_area(s));
clip_area = Some(get_clip_area(t, s));
area
},
};
let bg = Arranger::<Tui>::border_bg();
let bg = TuiTheme::border_bg();
if let Some([x, y, width, height]) = track_area {
to.fill_fg([x, y, 1, height], bg);
to.fill_fg([x + width, y, 1, height], bg);
@ -182,7 +188,7 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
})
}))
}).bg(bg.rgb);
let color = Arranger::<Tui>::title_fg(self.0.focused);
let color = TuiTheme::title_fg(self.0.focused);
let size = format!("{}x{}", self.0.size.w(), self.0.size.h());
let lower_right = TuiStyle::fg(size, color).pull_x(1).align_se().fill_xy();
lay!(arrangement, lower_right)