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

wip: unified focus system

Browse source
This commit is contained in:
🪞👃🪞 2024-08-24 00:27:24 +03:00
parent 8b59658015
commit 3a7aa9e9a3
10 changed files with 194 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/tek_sequencer/src/arranger_view_v.rs
View file

@ -14,7 +14,7 @@ pub fn draw_compact_2 (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usuall
draw(state, buf, area, track_cols.as_slice(), scene_rows.as_slice())
}
/// Draw arranger with number of rows per scene corresponding to duration of scene.
/// Draw arranger with number of rows per scene proportional to duration of scene.
pub fn draw_expanded (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let track_cols = track_clip_name_lengths(state.tracks.as_slice());
let scene_rows = scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice());
@ -30,14 +30,13 @@ pub fn draw (
) -> Usually<Rect> {
area.height = 2 + (rows[rows.len() - 1].1 / 96) as u16;
let offset = 3 + scene_name_max_len(state.scenes.as_ref()) as u16;
let Arranger { focus_sequencer, focused, entered, selected, .. } = *state;
let tracks = state.tracks.as_ref();
let scenes = state.scenes.as_ref();
Layered::new()
//.add_ref(&FillBg(Color::Rgb(30, 33, 36)))//COLOR_BG1))//bg_lo(state.focused, state.entered)))
.add_ref(&ColumnSeparators(offset, cols))
.add_ref(&RowSeparators(rows))
.add_ref(&CursorFocus(focus_sequencer, focused, entered, selected, offset, cols, rows))
.add_ref(&CursorFocus(state.selected, offset, cols, rows))
.add_ref(&Split::down()
.add_ref(&TracksHeader(offset, cols, tracks))
.add_ref(&SceneRows(offset, cols, rows, tracks, scenes)))
@ -81,12 +80,12 @@ impl<'a> Render for RowSeparators<'a> {
}
struct CursorFocus<'a>(
bool, bool, bool, ArrangerFocus, u16, &'a [(usize, usize)], &'a [(usize, usize)]
ArrangerFocus, u16, &'a [(usize, usize)], &'a [(usize, usize)]
);
impl<'a> Render for CursorFocus<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(focus_sequencer, focused, entered, selected, offset, cols, rows) = *self;
let Self(selected, offset, cols, rows) = *self;
let get_track_area = |t: usize| Rect {
x: offset + area.x + cols[t].1 as u16 - 1,
y: area.y,
@ -109,11 +108,9 @@ impl<'a> Render for CursorFocus<'a> {
let mut scene_area: Option<Rect> = None;
let mut clip_area: Option<Rect> = None;
let area = match selected {
ArrangerFocus::Mix => if focused && entered && selected == ArrangerFocus::Mix {
ArrangerFocus::Mix => {
fill_bg(buf, area, COLOR_BG0);
area
} else {
area
},
ArrangerFocus::Track(t) => {
track_area = Some(get_track_area(t));
@ -145,9 +142,6 @@ impl<'a> Render for CursorFocus<'a> {
} else if let Some(scene_area) = scene_area {
fill_bg(buf, scene_area, COLOR_BG0);
}
if !focus_sequencer {
Corners(Style::default().green().not_dim()).draw(buf, area)?;
}
Ok(area)
}
}
@ -212,7 +206,7 @@ impl<'a> Render for SceneRow<'a> {
let playing = scene.is_playing(tracks);
(if playing { "▶" } else { " " }).blit(buf, x, y, None)?;
scene.name.read().unwrap().blit(buf, x + 1, y, Some(Style::default().white()))?;
fill_bg(buf, Rect { x: x, y, width: offset.saturating_sub(1), height: 2 }, COLOR_BG1);
fill_bg(buf, Rect { x: x, y, width: offset.saturating_sub(1), height: area.height }, COLOR_BG1);
for (track, (w, x)) in track_cols.iter().enumerate() {
let x = *x as u16 + offset;