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

wip: back to 89 errors

Browse source
This commit is contained in:
🪞👃🪞 2025-05-14 15:16:43 +03:00
parent f3c67f95b5
commit 57eff50973
5 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/device/src/arranger/arranger_api.rs
View file

@ -36,37 +36,37 @@ impl ArrangementCommand {
Ok(None)
}
/// Set the color of the selected entity
fn set_color (arranger: &mut Arrangement, palette: Option<ItemTheme>) -> Option<ItemTheme> {
fn set_color (arranger: &mut Arrangement, palette: Option<ItemTheme>) -> Perhaps<Self> {
use Selection::*;
let palette = palette.unwrap_or_else(||ItemTheme::random());
Some(match arranger.selected {
Ok(Some(Self::SetColor { palette: match arranger.selected {
Some(Mix) => {
let old = arranger.color;
arranger.color = palette;
old
Some(old)
},
Some(Scene(s)) => {
let old = arranger.scenes[s].color;
arranger.scenes[s].color = palette;
old
Some(old)
}
Some(Track(t)) => {
let old = arranger.tracks[t].color;
arranger.tracks[t].color = palette;
old
Some(old)
}
Some(TrackClip { track, scene }) => {
if let Some(ref clip) = arranger.scenes[scene].clips[track] {
let mut clip = clip.write().unwrap();
let old = clip.color;
clip.color = palette;
old
Some(old)
} else {
return None
None
}
},
_ => todo!()
})
} }))
}
fn track (arranger: &mut Arrangement, track: TrackCommand) -> Perhaps<Self> {

6
crates/device/src/arranger/arranger_view.rs
View file

@ -167,11 +167,7 @@ impl<'a> ArrangerView<'a> {
.left(*width_side, Map::new(
move||arrangement.scenes_with_sizes(
*is_editing,
Self::H_SCENE,
Self::H_EDITOR,
selected_track,
selected_scene,
*is_editing, Self::H_SCENE, Self::H_EDITOR, selected_track, selected_scene,
).map_while(|(s, scene, y1, y2)|if y2 as u16 > *scenes_height {
None
} else {