view refactors; remove view_sizes

app/src/view.rs

@@ -3,7 +3,6 @@ mod view_clock;  pub use self::view_clock::*;
 mod view_color;  pub use self::view_color::*;
 mod view_memo;   pub use self::view_memo::*;
 mod view_meter;  pub use self::view_meter::*;
-mod view_sizes;  pub use self::view_sizes::*;
 mod view_track;  pub use self::view_track::*;
 mod view_ports;  pub use self::view_ports::*;
 mod view_layout; pub use self::view_layout::*;
@@ -134,6 +133,55 @@ impl<'a> ArrangerView<'a> {
 }
 
 impl Tek {
+    /// Spacing between tracks.
+    pub(crate) const TRACK_SPACING: usize = 0;
+    /// Default scene height.
+    pub(crate) const H_SCENE: usize = 2;
+    /// Default editor height.
+    pub(crate) const H_EDITOR: usize = 15;
+
+    /// Width of display
+    pub(crate) fn w (&self) -> u16 {
+        self.size.w() as u16
+    }
+    pub(crate) fn w_sidebar (&self) -> u16 {
+        self.w() / if self.is_editing() { 16 } else { 8 } as u16
+    }
+    /// Width taken by all tracks.
+    pub(crate) fn w_tracks (&self) -> u16 {
+        self.tracks_with_sizes().last().map(|(_, _, _, x)|x as u16).unwrap_or(0)
+    }
+    /// Width available to display tracks.
+    pub(crate) fn w_tracks_area (&self) -> u16 {
+        self.w().saturating_sub(2 * self.w_sidebar())
+    }
+    /// Height of display
+    pub(crate) fn h (&self) -> u16 {
+        self.size.h() as u16
+    }
+    /// Height available to display track headers.
+    pub(crate) fn h_tracks_area (&self) -> u16 {
+        5
+        //self.h().saturating_sub(self.h_inputs() + self.h_outputs())
+    }
+    /// Height available to display tracks.
+    pub(crate) fn h_scenes_area (&self) -> u16 {
+        //15
+        self.h().saturating_sub(self.h_inputs() + self.h_outputs() + 11)
+    }
+    /// Height taken by all inputs.
+    pub(crate) fn h_inputs (&self) -> u16 {
+        1 + self.inputs_with_sizes().last().map(|(_, _, _, _, y)|y as u16).unwrap_or(0)
+    }
+    /// Height taken by all outputs.
+    pub(crate) fn h_outputs (&self) -> u16 {
+        1 + self.outputs_with_sizes().last().map(|(_, _, _, _, y)|y as u16).unwrap_or(0)
+    }
+    /// Height taken by all scenes.
+    pub(crate) fn h_scenes (&self) -> u16 {
+        self.scenes_with_sizes(self.is_editing(), Self::H_SCENE, Self::H_EDITOR).last()
+            .map(|(_, _, _, y)|y as u16).unwrap_or(0)
+    }
 
     pub(crate) fn inputs_with_sizes (&self)
         -> impl PortsSizes<'_>
@@ -199,6 +247,18 @@ impl Tek {
 
 }
 
+/// Define a type alias for iterators of sized items (columns).
+macro_rules! def_sizes_iter {
+    ($Type:ident => $($Item:ty),+) => {
+        pub(crate) trait $Type<'a> =
+            Iterator<Item=(usize, $(&'a $Item,)+ usize, usize)> + Send + Sync + 'a;}}
+
+def_sizes_iter!(ScenesSizes  => Scene);
+def_sizes_iter!(TracksSizes  => Track);
+def_sizes_iter!(InputsSizes  => JackMidiIn);
+def_sizes_iter!(OutputsSizes => JackMidiOut);
+def_sizes_iter!(PortsSizes   => Arc<str>, [PortConnect]);
+
 #[cfg(test)] #[test] fn test_view_iter () {
     let mut tek = Tek::default();
     tek.editor = Some(Default::default());
@@ -209,3 +269,14 @@ impl Tek {
     //let _: Vec<_> = tek.scenes_with_colors(true, 10).collect();
     //let _: Vec<_> = tek.scenes_with_track_colors(true, 10, 10).collect();
 }
+#[cfg(test)] #[test] fn test_view_sizes () {
+    let app = Tek::default();
+    let _ = app.w();
+    let _ = app.w_sidebar();
+    let _ = app.w_tracks_area();
+    let _ = app.h();
+    let _ = app.h_tracks_area();
+    let _ = app.h_inputs();
+    let _ = app.h_outputs();
+    let _ = app.h_scenes();
+}