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

return impl Render

Browse source
This commit is contained in:
🪞👃🪞 2024-07-20 16:15:28 +03:00
parent 88964e405e
commit 5d7347137b
2 changed files with 179 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

330
src/devices/arranger.rs
View file

@ -75,7 +75,7 @@ pub struct Arranger {
} }
/// Display mode of arranger /// Display mode of arranger
enum ArrangerViewMode { pub enum ArrangerViewMode {
Vertical, Vertical,
VerticalCompact, VerticalCompact,
Horizontal, Horizontal,
@ -132,44 +132,86 @@ render!(Arranger |self, buf, area| match self.mode {
}); });
mod draw_vertical { mod draw_vertical {
use crate::{core::*, view::*, model::Track}; use crate::{core::*, view::*};
use super::{Arranger, focus::ArrangerFocus, track::track_clip_name_lengths, scene::{Scene, scene_ppqs, scene_name_max_len}}; use super::{Arranger, focus::ArrangerFocus, track::track_clip_name_lengths, scene::{Scene, scene_ppqs, scene_name_max_len}};
pub fn draw_expanded (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usually<Rect> { 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()); let scene_rows = scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice());
draw(state, buf, area, scene_rows.as_slice()) draw(state, buf, area, track_cols.as_slice(), scene_rows.as_slice())
} }
pub fn draw_compact (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usually<Rect> { pub fn draw_compact (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let track_cols = track_clip_name_lengths(state.tracks.as_slice());
let scene_rows = (0..=state.scenes.len()).map(|i|(96, 96*(i+1))).collect::<Vec<_>>(); let scene_rows = (0..=state.scenes.len()).map(|i|(96, 96*(i+1))).collect::<Vec<_>>();
draw(state, buf, area, scene_rows.as_slice()) draw(state, buf, area, track_cols.as_slice(), scene_rows.as_slice())
} }
pub fn draw ( pub fn draw (
state: &Arranger, buf: &mut Buffer, mut area: Rect, scene_rows: &[(usize, usize)] state: &Arranger,
buf: &mut Buffer,
mut area: Rect,
cols: &[(usize, usize)],
rows: &[(usize, usize)],
) -> Usually<Rect> { ) -> Usually<Rect> {
let track_cols = track_clip_name_lengths(state.tracks.as_slice()); area.height = 2 + (rows[rows.len() - 1].1 / 96) as u16;
area.height = 2 + (scene_rows[scene_rows.len() - 1].1 / 96) as u16;
let offset = 3 + scene_name_max_len(state.scenes.as_ref()) as u16; let offset = 3 + scene_name_max_len(state.scenes.as_ref()) as u16;
column_separators(buf, area, offset, cols)?;
fill_bg(buf, area, Nord::bg_lo(state.focused, state.entered));
cursor_focus(state, buf, area, offset, cols, rows)?;
Split::down([
&tracks_header(state, cols, offset),
&scene_rows(state, cols, rows, offset),
]).render(buf, area)?;
row_separators(buf, area, rows);
Ok(area)
}
fn column_separators (
buf: &mut Buffer, area: Rect, offset: u16, cols: &[(usize, usize)]
) -> Usually<()> {
let style = Some(Style::default().fg(Color::Rgb(0,0,0))); let style = Some(Style::default().fg(Color::Rgb(0,0,0)));
for (_, x) in track_cols.iter() { for (_, x) in cols.iter() {
let x = offset + area.x + *x as u16 - 1; let x = offset + area.x + *x as u16 - 1;
for y in area.y..area.height+area.y { for y in area.y..area.height+area.y {
"▎".blit(buf, x, y, style)?; "▎".blit(buf, x, y, style)?;
} }
} }
Ok(())
}
fill_bg(buf, area, Nord::bg_lo(state.focused, state.entered)); fn row_separators (buf: &mut Buffer, area: Rect, rows: &[(usize, usize)]) {
for (_, y) in rows.iter() {
let y = area.y + (*y / 96) as u16 + 1;
for x in area.x..area.width+area.y-2 {
let cell = buf.get_mut(x, y);
cell.modifier = Modifier::UNDERLINED;
cell.underline_color = Color::Rgb(0, 0, 0);
}
}
}
fn cursor_focus (
state: &Arranger,
buf: &mut Buffer,
area: Rect,
offset: u16,
cols: &[(usize, usize)],
rows: &[(usize, usize)],
) -> Usually<()> {
match state.selected { match state.selected {
ArrangerFocus::Mix => if state.focused && state.entered && state.selected == ArrangerFocus::Mix { ArrangerFocus::Mix => if state.focused
&& state.entered
&& state.selected == ArrangerFocus::Mix
{
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered)); fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
Corners(Style::default().green().not_dim()).draw(buf, area)?; Corners(Style::default().green().not_dim()).draw(buf, area)?;
}, },
ArrangerFocus::Track(t) => { ArrangerFocus::Track(t) => {
let area = Rect { let area = Rect {
x: offset + area.x + track_cols[t].1 as u16 - 1, x: offset + area.x + cols[t].1 as u16 - 1,
y: area.y, y: area.y,
width: track_cols[t].0 as u16, width: cols[t].0 as u16,
height: area.height height: area.height
}; };
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered)); fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
@ -178,31 +220,31 @@ mod draw_vertical {
ArrangerFocus::Scene(s) => { ArrangerFocus::Scene(s) => {
let area = Rect { let area = Rect {
x: area.x, x: area.x,
y: 2 + area.y + (scene_rows[s].1 / 96) as u16, y: 2 + area.y + (rows[s].1 / 96) as u16,
width: area.width, width: area.width,
height: (scene_rows[s].0 / 96) as u16 height: (rows[s].0 / 96) as u16
}; };
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered)); fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
Corners(Style::default().green().not_dim()).draw(buf, area)?; Corners(Style::default().green().not_dim()).draw(buf, area)?;
}, },
ArrangerFocus::Clip(t, s) => { ArrangerFocus::Clip(t, s) => {
let track_area = Rect { let track_area = Rect {
x: offset + area.x + track_cols[t].1 as u16 - 1, x: offset + area.x + cols[t].1 as u16 - 1,
y: area.y, y: area.y,
width: track_cols[t].0 as u16, width: cols[t].0 as u16,
height: area.height height: area.height
}; };
let scene_area = Rect { let scene_area = Rect {
x: area.x, x: area.x,
y: 2 + area.y + (scene_rows[s].1 / 96) as u16, y: 2 + area.y + (rows[s].1 / 96) as u16,
width: area.width, width: area.width,
height: (scene_rows[s].0 / 96) as u16 height: (rows[s].0 / 96) as u16
}; };
let area = Rect { let area = Rect {
x: offset + area.x + track_cols[t].1 as u16 - 1, x: offset + area.x + cols[t].1 as u16 - 1,
y: 2 + area.y + (scene_rows[s].1 / 96) as u16, y: 2 + area.y + (rows[s].1 / 96) as u16,
width: track_cols[t].0 as u16, width: cols[t].0 as u16,
height: (scene_rows[s].0 / 96) as u16 height: (rows[s].0 / 96) as u16
}; };
let lo = Nord::bg_hi(state.focused, state.entered); let lo = Nord::bg_hi(state.focused, state.entered);
let hi = Nord::bg_hier(state.focused, state.entered); let hi = Nord::bg_hier(state.focused, state.entered);
@ -211,37 +253,18 @@ mod draw_vertical {
fill_bg(buf, area, hi); fill_bg(buf, area, hi);
Corners(Style::default().green().not_dim()).draw(buf, area)?; Corners(Style::default().green().not_dim()).draw(buf, area)?;
}, },
} };
Ok(())
Split::down([
&|buf: &mut Buffer, area: Rect|state.draw_tracks_header(
buf, area, track_cols.as_slice(), offset),
&|buf: &mut Buffer, area: Rect|state.draw_scene_rows(
buf, area, track_cols.as_slice(), scene_rows, offset),
]).render(buf, area)?;
for (_, y) in scene_rows.iter() {
let y = area.y + (*y / 96) as u16 + 1;
for x in area.x..area.width+area.y-2 {
let cell = buf.get_mut(x, y);
cell.modifier = Modifier::UNDERLINED;
cell.underline_color = Color::Rgb(0, 0, 0);
}
}
Ok(area)
} }
/// Rendering with vertical time pub fn tracks_header <'a> (
impl Arranger { state: &'a Arranger,
track_cols: &'a [(usize, usize)],
pub fn draw_tracks_header ( offset: u16,
&self, ) -> impl Render + 'a {
buf: &mut Buffer, move |buf: &mut Buffer, area: Rect| {
area: Rect,
track_cols: &[(usize, usize)],
offset: u16,
) -> Usually<Rect> {
let Rect { y, width, .. } = area; let Rect { y, width, .. } = area;
for (track, (_, x)) in self.tracks.iter().zip(track_cols) { for (track, (_, x)) in state.tracks.iter().zip(track_cols) {
let x = *x as u16; let x = *x as u16;
if x > width { if x > width {
break break
@ -250,15 +273,15 @@ mod draw_vertical {
} }
Ok(Rect { x: area.x, y, width, height: 2 }) Ok(Rect { x: area.x, y, width, height: 2 })
} }
}
pub fn draw_scene_rows ( pub fn scene_rows <'a> (
&self, state: &'a Arranger,
buf: &mut Buffer, track_cols: &'a [(usize, usize)],
area: Rect, scene_rows: &'a [(usize, usize)],
track_cols: &[(usize, usize)], offset: u16,
scene_rows: &[(usize, usize)], ) -> impl Render + 'a {
offset: u16, move |buf: &mut Buffer, area: Rect| {
) -> Usually<Rect> {
let black = Some(Style::default().fg(Color::Rgb(0, 0, 0))); let black = Some(Style::default().fg(Color::Rgb(0, 0, 0)));
let Rect { mut y, height, .. } = area; let Rect { mut y, height, .. } = area;
for (_, x) in track_cols.iter() { for (_, x) in track_cols.iter() {
@ -269,58 +292,56 @@ mod draw_vertical {
} }
} }
} }
for (scene, (pulses, _)) in self.scenes.iter().zip(scene_rows) { for (scene, (pulses, _)) in state.scenes.iter().zip(scene_rows) {
if y > height { if y > height {
break break
} }
let h = (pulses / 96) as u16; let h = (pulses / 96) as u16;
let area = Rect { x: area.x, y, width: area.width, height: h.min(area.height - y) }; let area = Rect { x: area.x, y, width: area.width, height: h.min(area.height - y) };
self.draw_scene_row(buf, area, scene, track_cols, offset)?; scene_row(state, buf, area, scene, track_cols, offset)?;
y = y + h y = y + h
} }
Ok(area) Ok(area)
} }
}
fn draw_scene_row ( fn scene_row (
&self, state: &Arranger,
buf: &mut Buffer, buf: &mut Buffer,
area: Rect, area: Rect,
scene: &Scene, scene: &Scene,
track_cols: &[(usize, usize)], track_cols: &[(usize, usize)],
offset: u16 offset: u16
) -> Usually<u16> { ) -> Usually<u16> {
let Rect { y, width, .. } = area; let Rect { y, width, .. } = area;
let tracks = self.tracks.as_ref(); let tracks = state.tracks.as_ref();
let playing = scene.is_playing(self.tracks.as_ref()); let playing = scene.is_playing(tracks);
(if playing { "▶" } else { " " }).blit(buf, area.x, y, None)?; (if playing { "▶" } else { " " }).blit(buf, area.x, y, None)?;
scene.name.blit(buf, area.x + 1, y, None)?; scene.name.blit(buf, area.x + 1, y, None)?;
let style = Some(Style::default().white()); let style = Some(Style::default().white());
for (track, (w, x)) in track_cols.iter().enumerate() { for (track, (w, x)) in track_cols.iter().enumerate() {
let x = *x as u16 + offset; let x = *x as u16 + offset;
if x > width { if x > width {
break break
} }
let tracks: &[Track] = self.tracks.as_ref(); if let (Some(track), Some(Some(clip))) = (
if let (Some(track), Some(Some(clip))) = ( tracks.get(track), scene.clips.get(track)
tracks.get(track), scene.clips.get(track) ) {
) { if let Some(phrase) = track.phrases.get(*clip) {
if let Some(phrase) = track.phrases.get(*clip) { let phrase = phrase.read().unwrap();
let phrase = phrase.read().unwrap(); phrase.name.blit(buf, x, y, style)?;
phrase.name.blit(buf, x, y, style)?; if track.sequence == Some(*clip) {
if track.sequence == Some(*clip) { fill_bg(buf, Rect {
fill_bg(buf, Rect { x: x - 1,
x: x - 1, y,
y, width: *w as u16,
width: *w as u16, height: area.height,
height: area.height, }, Color::Rgb(40,80,50));
}, Color::Rgb(40,80,50));
}
} }
} }
} }
Ok((scene.pulses(tracks) / 96) as u16)
} }
Ok((scene.pulses(tracks) / 96) as u16)
} }
} }
@ -328,40 +349,36 @@ mod draw_horizontal {
use crate::{core::*, view::*}; use crate::{core::*, view::*};
use super::{Arranger, track::*}; use super::{Arranger, track::*};
pub fn draw (state: &Arranger, buf: &mut Buffer, area: Rect) -> Usually<Rect> { pub fn draw (state: &Arranger, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> {
area.height = area.height.min((2 + state.tracks.len() * 2) as u16);
let area = Split::right([ let area = Split::right([
// Track name &track_name_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_name_column(buf, area), &track_mon_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_mon_column(buf, area), &track_rec_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_rec_column(buf, area), &track_ovr_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_ovr_column(buf, area), &track_del_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_del_column(buf, area), &track_gain_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_gain_column(buf, area), &track_scenes_column(state),
&|buf: &mut Buffer, area: Rect|state.draw_track_scenes_column(buf, area),
]).render(buf, area)?; ]).render(buf, area)?;
fill_bg(buf, area, Nord::bg_lo(state.focused, state.entered)); fill_bg(buf, area, Nord::bg_lo(state.focused, state.entered));
Ok(area) Ok(area)
} }
/// Rendering with horizontal time fn track_name_column <'a> (state: &'a Arranger) -> impl Render + 'a {
impl Arranger { let dim = Some(Style::default().dim());
pub fn draw_track_name_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { let yellow = Some(Style::default().yellow().bold().not_dim());
area.width = 3 + 5.max(track_name_max_len(self.tracks.as_slice())) as u16; let white = Some(Style::default().white().bold().not_dim());
let dim = Some(Style::default().dim()); move |buf: &mut Buffer, mut area: Rect| {
let yellow = Some(Style::default().yellow().bold().not_dim()); area.width = 3 + 5.max(track_name_max_len(state.tracks.as_slice())) as u16;
let white = Some(Style::default().white().bold().not_dim());
let offset = 0; // track scroll offset let offset = 0; // track scroll offset
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
"Mixer".blit(buf, area.x + 1, area.y + y, dim)?; "Mixer".blit(buf, area.x + 1, area.y + y, dim)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2 + offset; let index = (y as usize - 2) / 2 + offset;
if let Some(track) = self.tracks.get(index) { if let Some(track) = state.tracks.get(index) {
let style = if self.selected.track() == Some(index) { let selected = state.selected.track() == Some(index);
yellow let style = if selected { yellow } else { white };
} else {
white
};
format!(" {index:>02} ").blit(buf, area.x, area.y + y, style)?; format!(" {index:>02} ").blit(buf, area.x, area.y + y, style)?;
track.name.blit(buf, area.x + 4, area.y + y, style)?; track.name.blit(buf, area.x + 4, area.y + y, style)?;
} }
@ -369,21 +386,21 @@ mod draw_horizontal {
} }
Ok(area) Ok(area)
} }
}
pub fn draw_track_mon_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { fn track_mon_column <'a> (state: &'a Arranger) -> impl Render + 'a {
let style4 = Some(Style::default().dim()); let on = Some(Style::default().not_dim().green().bold());
let off = Some(Style::default().dim());
move |buf: &mut Buffer, mut area: Rect| {
area.x = area.x + 1; area.x = area.x + 1;
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
//" MON ".blit(buf, area.x, area.y + y, style2)?; //" MON ".blit(buf, area.x, area.y + y, style2)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2; let index = (y as usize - 2) / 2;
if let Some(track) = self.tracks.get(index) { if let Some(track) = state.tracks.get(index) {
" MON ".blit(buf, area.x, area.y + y, if track.monitoring { let style = if track.monitoring { on } else { off };
Some(Style::default().not_dim().green().bold()) " MON ".blit(buf, area.x, area.y + y, style)?;
} else {
style4
})?;
} else { } else {
area.height = y; area.height = y;
break break
@ -393,21 +410,21 @@ mod draw_horizontal {
area.width = 4; area.width = 4;
Ok(area) Ok(area)
} }
}
pub fn draw_track_rec_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { fn track_rec_column <'a> (state: &'a Arranger) -> impl Render + 'a {
let style4 = Some(Style::default().dim()); let on = Some(Style::default().not_dim().red().bold());
let off = Some(Style::default().dim());
move |buf: &mut Buffer, mut area: Rect| {
area.x = area.x + 1; area.x = area.x + 1;
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
//" REC ".blit(buf, area.x, area.y + y, style2)?; //" REC ".blit(buf, area.x, area.y + y, style2)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2; let index = (y as usize - 2) / 2;
if let Some(track) = self.tracks.get(index) { if let Some(track) = state.tracks.get(index) {
" REC ".blit(buf, area.x, area.y + y, if track.recording { let style = if track.recording { on } else { off };
Some(Style::default().not_dim().red().bold()) " REC ".blit(buf, area.x, area.y + y, style)?;
} else {
style4
})?;
} else { } else {
area.height = y; area.height = y;
break break
@ -417,20 +434,23 @@ mod draw_horizontal {
area.width = 4; area.width = 4;
Ok(area) Ok(area)
} }
}
pub fn draw_track_ovr_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { fn track_ovr_column <'a> (state: &'a Arranger) -> impl Render + 'a {
let style4 = Some(Style::default().dim()); let on = Some(Style::default().not_dim().yellow().bold());
let off = Some(Style::default().dim());
move |buf: &mut Buffer, mut area: Rect| {
area.x = area.x + 1; area.x = area.x + 1;
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
//" OVR ".blit(buf, area.x, area.y + y, style2)?; //" OVR ".blit(buf, area.x, area.y + y, style2)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2; let index = (y as usize - 2) / 2;
if let Some(track) = self.tracks.get(index) { if let Some(track) = state.tracks.get(index) {
" OVR ".blit(buf, area.x, area.y + y, if track.overdub { " OVR ".blit(buf, area.x, area.y + y, if track.overdub {
Some(Style::default().not_dim().yellow().bold()) on
} else { } else {
style4 off
})?; })?;
} else { } else {
area.height = y; area.height = y;
@ -441,17 +461,19 @@ mod draw_horizontal {
area.width = 4; area.width = 4;
Ok(area) Ok(area)
} }
}
pub fn draw_track_del_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { fn track_del_column <'a> (state: &'a Arranger) -> impl Render + 'a {
let style4 = Some(Style::default().dim()); let off = Some(Style::default().dim());
move |buf: &mut Buffer, mut area: Rect| {
area.x = area.x + 1; area.x = area.x + 1;
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
//" DEL ".blit(buf, area.x, area.y + y, style2)?; //" DEL ".blit(buf, area.x, area.y + y, style2)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2; let index = (y as usize - 2) / 2;
if let Some(_) = self.tracks.get(index) { if let Some(_) = state.tracks.get(index) {
" DEL ".blit(buf, area.x, area.y + y, style4)?; " DEL ".blit(buf, area.x, area.y + y, off)?;
} else { } else {
area.height = y; area.height = y;
break break
@ -461,17 +483,19 @@ mod draw_horizontal {
area.width = 4; area.width = 4;
Ok(area) Ok(area)
} }
}
pub fn draw_track_gain_column (&self, buf: &mut Buffer, mut area: Rect) -> Usually<Rect> { fn track_gain_column <'a> (state: &'a Arranger) -> impl Render + 'a {
let style4 = Some(Style::default().dim()); let off = Some(Style::default().dim());
move |buf: &mut Buffer, mut area: Rect| {
area.x = area.x + 1; area.x = area.x + 1;
for y in 0..area.height { for y in 0..area.height {
if y == 0 { if y == 0 {
//" GAIN ".blit(buf, area.x, area.y + y, style2)?; //" GAIN ".blit(buf, area.x, area.y + y, style2)?;
} else if y % 2 == 0 { } else if y % 2 == 0 {
let index = (y as usize - 2) / 2; let index = (y as usize - 2) / 2;
if let Some(_) = self.tracks.get(index) { if let Some(_) = state.tracks.get(index) {
" +0.0 ".blit(buf, area.x, area.y + y, style4)?; " +0.0 ".blit(buf, area.x, area.y + y, off)?;
} else { } else {
area.height = y; area.height = y;
break break
@ -481,12 +505,14 @@ mod draw_horizontal {
area.width = 7; area.width = 7;
Ok(area) Ok(area)
} }
}
pub fn draw_track_scenes_column (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> { fn track_scenes_column <'a> (state: &'a Arranger) -> impl Render + 'a {
|buf: &mut Buffer, area: Rect| {
let mut x2 = 0; let mut x2 = 0;
let Rect { x, y, height, .. } = area; let Rect { x, y, height, .. } = area;
for (scene_index, scene) in self.scenes.iter().enumerate() { for (scene_index, scene) in state.scenes.iter().enumerate() {
let active_scene = self.selected.scene() == Some(scene_index); let active_scene = state.selected.scene() == Some(scene_index);
let sep = Some(if active_scene { let sep = Some(if active_scene {
Style::default().yellow().not_dim() Style::default().yellow().not_dim()
} else { } else {
@ -498,10 +524,10 @@ mod draw_horizontal {
let mut x3 = scene.name.len() as u16; let mut x3 = scene.name.len() as u16;
scene.name.blit(buf, x + x2, y, sep)?; scene.name.blit(buf, x + x2, y, sep)?;
for (i, clip) in scene.clips.iter().enumerate() { for (i, clip) in scene.clips.iter().enumerate() {
let active_track = self.selected.track() == Some(i); let active_track = state.selected.track() == Some(i);
if let Some(clip) = clip { if let Some(clip) = clip {
let y2 = y + 2 + i as u16 * 2; let y2 = y + 2 + i as u16 * 2;
let label = match self.tracks[i].phrases.get(*clip) { let label = match state.tracks[i].phrases.get(*clip) {
Some(phrase) => &format!("{}", phrase.read().unwrap().name), Some(phrase) => &format!("{}", phrase.read().unwrap().name),
None => "...." None => "...."
}; };

2
src/view/border.rs
View file

@ -151,7 +151,7 @@ border! {
} }
}, },
Corners { Corners {
"🬆" "" "🬊" "🬆" "" "🬊" // 🬴 🬸
"" "" "" ""
"🬱" "" "🬵" "🬱" "" "🬵"
fn style (&self) -> Option<Style> { fn style (&self) -> Option<Style> {