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

scene_index -> s

Browse source
This commit is contained in:
🪞👃🪞 2025-04-23 15:32:19 +03:00
parent 6b9099b087
commit 9b754c0f52
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/app/src/view.rs
View file

@ -116,14 +116,14 @@ impl<'a> ArrangerView<'a> {
} = self; } = self;
let scene_headers = Map::new(||self.scenes_with_scene_colors(), let scene_headers = Map::new(||self.scenes_with_scene_colors(),
move|(index, scene, y1, y2, previous): SceneWithColor, _|{ move|(s, scene, y1, y2, previous): SceneWithColor, _|{
let height = (1 + y2 - y1) as u16; let height = (1 + y2 - y1) as u16;
let name = Some(scene.name.clone()); let name = Some(scene.name.clone());
let content = Fill::x(Align::w(Tui::bold(true, Bsp::e(" ⯈ ", name)))); let content = Fill::x(Align::w(Tui::bold(true, Bsp::e(" ⯈ ", name))));
let same_track = true; let same_track = true;
let selected = same_track && *scene_selected == Some(index); let selected = same_track && *scene_selected == Some(s);
let neighbor = same_track && index > 0 && *scene_selected == Some(index - 1); let neighbor = same_track && s > 0 && *scene_selected == Some(s - 1);
let is_last = *scene_last == index; let is_last = *scene_last == s;
let theme = scene.color; let theme = scene.color;
let fg = theme.lightest.rgb; let fg = theme.lightest.rgb;
let bg = if selected { theme.light } else { theme.base }.rgb; let bg = if selected { theme.light } else { theme.base }.rgb;
@ -150,7 +150,7 @@ impl<'a> ArrangerView<'a> {
let scene_track_clips = per_track(*width_mid, ||self.tracks_with_sizes_scrolled(), let scene_track_clips = per_track(*width_mid, ||self.tracks_with_sizes_scrolled(),
move|track_index, track|Map::new(move||self.scenes_with_track_colors(track_index), move|track_index, track|Map::new(move||self.scenes_with_track_colors(track_index),
move|(scene_index, scene, y1, y2, previous): SceneWithColor<'a>, _|{ move|(s, scene, y1, y2, previous): SceneWithColor<'a>, _|{
let (name, theme) = if let Some(clip) = &scene.clips[track_index] { let (name, theme) = if let Some(clip) = &scene.clips[track_index] {
let clip = clip.read().unwrap(); let clip = clip.read().unwrap();
(Some(clip.name.clone()), clip.color) (Some(clip.name.clone()), clip.color)
@ -160,9 +160,9 @@ impl<'a> ArrangerView<'a> {
let height = (1 + y2 - y1) as u16; let height = (1 + y2 - y1) as u16;
let content = Fill::x(Align::w(Tui::bold(true, Bsp::e(" ⏹ ", name)))); let content = Fill::x(Align::w(Tui::bold(true, Bsp::e(" ⏹ ", name))));
let same_track = *track_selected == Some(track_index); let same_track = *track_selected == Some(track_index);
let selected = same_track && *scene_selected == Some(scene_index); let selected = same_track && *scene_selected == Some(s);
let neighbor = same_track && scene_index > 0 && *scene_selected == Some(scene_index - 1); let neighbor = same_track && s > 0 && *scene_selected == Some(s - 1);
let is_last = *scene_last == scene_index; let is_last = *scene_last == s;
let fg = theme.lightest.rgb; let fg = theme.lightest.rgb;
let bg = if selected { theme.light } else { theme.base }.rgb; let bg = if selected { theme.light } else { theme.base }.rgb;
let hi = if let Some(previous) = previous { let hi = if let Some(previous) = previous {
@ -184,7 +184,7 @@ impl<'a> ArrangerView<'a> {
map_south(y1 as u16, height, Bsp::b(Fixed::y(height, Phat { map_south(y1 as u16, height, Bsp::b(Fixed::y(height, Phat {
width: 0, height: 0, content, colors: [fg, bg, hi, lo] width: 0, height: 0, content, colors: [fg, bg, hi, lo]
}), When( }), When(
*is_editing && same_track && *scene_selected == Some(scene_index), *is_editing && same_track && *scene_selected == Some(s),
editor editor
))) )))
})); }));