restruct: 65e

This commit is contained in:
i do not exist 2026-06-23 22:02:09 +03:00
parent ae347eeef7
commit b3e9cde8a1
4 changed files with 38 additions and 49 deletions

View file

@ -27,13 +27,12 @@ pub trait ClipsView: TracksView + ScenesView {
/// Draw clips per scene
fn view_scenes_clips <'a> (&'a self) -> impl Draw<Tui> + 'a {
crate::view::view_scenes_clips(
self.tracks_with_sizes(), self.clips_size()
)
}
/// Draw clips for tracks
fn view_track_clips <'a> (&'a self, track_index: usize, track: &'a Track) -> impl Draw<Tui> + 'a {
crate::view::view_track_clips(
self.scenes_with_sizes(), self.selection(), self.editor(), track_index, track
self.scenes_with_sizes(),
self.tracks_with_sizes(),
self.selection(),
self.editor(),
self.clips_size(),
self.is_editing(),
)
}
}

View file

@ -61,12 +61,7 @@ pub trait ScenesView: HasEditor + HasSelection + HasSceneScroll + HasClipsSize +
fn view_scenes_names (&self) -> impl Draw<Tui> {
crate::view::view_scenes_names(
self.scenes_with_sizes()
)
}
fn view_scene_name <'a> (&'a self, index: usize, scene: &'a Scene) -> impl Draw<Tui> + 'a {
crate::view::view_scene_name(
self.selected(), self.editor(), index, scene
self.scenes_with_sizes(), self.selection(), self.editor(), self.is_editing()
)
}
fn scenes_with_sizes (&self) -> impl ScenesSizes<'_> {

View file

@ -53,7 +53,7 @@ impl Track {
tracks: impl Fn() -> U + Send + Sync + 'a,
callback: impl Fn(usize, &'a Track)->T + Send + Sync + 'a
) -> impl Draw<Tui> + 'a {
per(tracks, callback)
view_track_per(tracks, callback)
}
/// Create a new track connecting the [Sequencer] to a [Sampler].
@ -180,7 +180,7 @@ pub trait TracksView: ScenesView + HasMidiIns + HasMidiOuts + HasTrackScroll {
/// Draw name of each track
fn view_track_names (&self, theme: ItemTheme) -> impl Draw<Tui> {
crate::view::view_track_names(
self.tracks_with_sizes(), self.tracks().len(), self.scenes().len(), self.selection()
theme, self.tracks_with_sizes(), self.tracks().len(), self.scenes().len(), self.selection()
)
}
/// Draw outputs per track
@ -251,12 +251,12 @@ impl_as_mut_opt!(Track: |self: Arrangement| self.selected_track_mut());
impl Arrangement {
#[cfg(feature = "track")]
pub fn view_inputs (&self, _theme: ItemTheme) -> impl Draw<Tui> + '_ {
crate::view::view_inputs()
crate::view::view_inputs(self.tracks_with_sizes(), self.midi_ins().as_slice())
}
#[cfg(feature = "track")]
pub fn view_inputs_header (&self) -> impl Draw<Tui> + '_ {
crate::view::view_inputs_header(self.tracks_with_sizes())
crate::view::view_inputs_header(self.tracks_with_sizes(), self.midi_ins().as_slice())
}
#[cfg(feature = "track")]