diff --git a/config/config_arranger.edn b/config/config_arranger.edn index 0a8b2b6d..1f93c270 100644 --- a/config/config_arranger.edn +++ b/config/config_arranger.edn @@ -17,10 +17,9 @@ (layer "./keys_arranger.edn") (layer "./keys_global.edn")) -(view - (bsp/a :view-dialog - (bsp/s (fixed/y 1 :view-transport) - (bsp/n (fixed/y 1 :view-status) - (fill/xy (bsp/a - (fill/xy (align/e :view-pool)) - :view-arranger)))))) +(view (bsp/a :view-dialog + (bsp/e + (fill/y (align/n (bsp/s :view-status-v (bsp/s + (bsp/s :view-midi-ports-status :view-audio-ports-status) + (bsp/n :view-editor-status :view-pool))))) + :view-arranger))) diff --git a/crates/device/src/arranger/arranger_model.rs b/crates/device/src/arranger/arranger_model.rs index 5f38e61e..ba43caf2 100644 --- a/crates/device/src/arranger/arranger_model.rs +++ b/crates/device/src/arranger/arranger_model.rs @@ -64,7 +64,7 @@ impl Arrangement { } /// Width available to display tracks. pub fn w_tracks_area (&self, is_editing: bool) -> u16 { - self.w().saturating_sub(2 * self.w_sidebar(is_editing)) + self.w().saturating_sub(self.w_sidebar(is_editing)) } /// Height of display pub fn h (&self) -> u16 { @@ -77,13 +77,7 @@ impl Arrangement { } /// Height available to display tracks. pub fn h_scenes_area (&self) -> u16 { - //15 - self.h().saturating_sub( - self.h_inputs() + - self.h_outputs() + - self.h_devices() + - 13 // FIXME - ) + 20 // FIXME } /// Height taken by all scenes. pub fn h_scenes (&self, is_editing: bool) -> u16 { diff --git a/crates/device/src/arranger/arranger_view.rs b/crates/device/src/arranger/arranger_view.rs index a903d26f..6119df7b 100644 --- a/crates/device/src/arranger/arranger_view.rs +++ b/crates/device/src/arranger/arranger_view.rs @@ -2,26 +2,19 @@ use crate::*; pub struct ArrangerView<'a> { pub arrangement: &'a Arrangement, - pub is_editing: bool, - pub width: u16, pub width_mid: u16, pub width_side: u16, - pub inputs_height: u16, pub outputs_height: u16, - pub scene_last: usize, pub scene_scroll: Fill>, pub scene_selected: Option, pub scenes_height: u16, - pub track_scroll: Fill>, pub track_selected: Option, pub tracks_height: u16, - - pub show_debug_info: bool, } impl<'a> ArrangerView<'a> { @@ -36,14 +29,11 @@ impl<'a> ArrangerView<'a> { Self { arrangement, is_editing, - - width: arrangement.w(), - width_mid: arrangement.w_tracks_area(is_editing), - width_side: arrangement.w_sidebar(is_editing), - + width: arrangement.w_tracks_area(is_editing), + width_mid: arrangement.w_tracks_area(is_editing).saturating_sub(20), + width_side: 20, inputs_height: arrangement.h_inputs(), outputs_height: arrangement.h_outputs(), - scenes_height: h_scenes_area, scene_selected: arrangement.selection().scene(), scene_last: arrangement.scenes.len().saturating_sub(1), @@ -52,7 +42,6 @@ impl<'a> ArrangerView<'a> { length: h_scenes_area as usize, total: h_scenes as usize, })), - tracks_height: h_tracks_area, track_selected: arrangement.selection().track(), track_scroll: Fill::x(Fixed::y(1, ScrollbarH { @@ -60,8 +49,6 @@ impl<'a> ArrangerView<'a> { length: h_tracks_area as usize, total: h_scenes as usize, })), - - show_debug_info: false } } } @@ -148,7 +135,6 @@ impl<'a> ArrangerView<'a> { scenes_height, scene_last, scene_selected, track_selected, is_editing, .. } = self; - let selection = Has::::get(self.arrangement); let selected_track = selection.track(); let selected_scene = selection.scene();