mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 04:06:45 +01:00
last small wave of 15 errors?
This commit is contained in:
parent
4fe51b5267
commit
872c2d94d6
11 changed files with 181 additions and 189 deletions
|
|
@ -35,7 +35,6 @@ impl<'a> ArrangerView<'a> {
|
|||
editor: Option<&'a MidiEditor>
|
||||
) -> Self {
|
||||
let is_editing = editor.is_some();
|
||||
let selected = arrangement.selected;
|
||||
let h_tracks_area = arrangement.h_tracks_area();
|
||||
let h_scenes_area = arrangement.h_scenes_area();
|
||||
let h_scenes = arrangement.h_scenes(is_editing);
|
||||
|
|
@ -54,7 +53,7 @@ impl<'a> ArrangerView<'a> {
|
|||
outputs_count: arrangement.midi_outs.len(),
|
||||
|
||||
scenes_height: h_scenes_area,
|
||||
scene_selected: selected.map(|s|s.scene()).flatten(),
|
||||
scene_selected: arrangement.selection().scene(),
|
||||
scene_count: arrangement.scenes.len(),
|
||||
scene_last: arrangement.scenes.len().saturating_sub(1),
|
||||
scene_scroll: Fill::y(Fixed::x(1, ScrollbarV {
|
||||
|
|
@ -65,7 +64,7 @@ impl<'a> ArrangerView<'a> {
|
|||
|
||||
tracks_height: h_tracks_area,
|
||||
track_count: arrangement.tracks.len(),
|
||||
track_selected: selected.map(|s|s.track()).flatten(),
|
||||
track_selected: arrangement.selection().track(),
|
||||
track_scroll: Fill::x(Fixed::y(1, ScrollbarH {
|
||||
offset: arrangement.track_scroll,
|
||||
length: h_tracks_area as usize,
|
||||
|
|
@ -160,9 +159,9 @@ impl<'a> ArrangerView<'a> {
|
|||
track_selected, is_editing, ..
|
||||
} = self;
|
||||
|
||||
let selection = Has::<Option<Selection>>::get(self.arrangement);
|
||||
let selected_track = selection.map(|s|s.track()).flatten();
|
||||
let selected_scene = selection.map(|s|s.scene()).flatten();
|
||||
let selection = Has::<Selection>::get(self.arrangement);
|
||||
let selected_track = selection.track();
|
||||
let selected_scene = selection.scene();
|
||||
Tryptich::center(*scenes_height)
|
||||
|
||||
.left(*width_side, Map::new(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue