remove ArrangerView

src/model/arranger.rs

@@ -1,98 +1,20 @@
 use crate::{core::*, model::*};
 
+/// Represents the tracks and scenes of the composition.
 pub struct Arranger {
     /// Display mode of arranger
-    pub mode:      bool,
+    pub mode:     bool,
     /// Currently selected element.
-    pub selected:  ArrangerFocus,
+    pub selected: ArrangerFocus,
     /// Collection of tracks.
-    pub tracks:    Vec<Track>,
+    pub tracks:   Vec<Track>,
     /// Collection of scenes.
-    pub scenes:    Vec<Scene>,
+    pub scenes:   Vec<Scene>,
+
+    pub focused: bool,
+    pub entered: bool,
 }
 
-#[derive(PartialEq)]
-pub enum ArrangerFocus {
-    /// The whole mix is selected
-    Mix,
-    /// A track is selected.
-    Track(usize),
-    /// A scene is selected.
-    Scene(usize),
-    /// A clip (track × scene) is selected.
-    Clip(usize, usize),
-}
-
-/// Identification methods
-impl ArrangerFocus {
-    pub fn is_track (&self) -> bool {
-        match self { Self::Track(_) => true, _ => false }
-    }
-    pub fn is_scene (&self) -> bool {
-        match self { Self::Scene(_) => true, _ => false }
-    }
-    pub fn is_clip (&self) -> bool {
-        match self { Self::Clip(_, _) => true, _ => false }
-    }
-}
-
-/// Track methods
-impl ArrangerFocus {
-    pub fn track (&self) -> Option<usize> {
-        match self {
-            Self::Clip(t, _) => Some(*t),
-            Self::Track(t)   => Some(*t),
-            _ => None
-        }
-    }
-    pub fn track_next (&mut self, last_track: usize) {
-        *self = match self {
-            Self::Mix        => Self::Track(0),
-            Self::Track(t)   => Self::Track(last_track.min(*t + 1)),
-            Self::Scene(s)   => Self::Clip(0, *s),
-            Self::Clip(t, s) => Self::Clip(last_track.min(*t + 1), *s),
-        }
-    }
-    pub fn track_prev (&mut self) {
-        *self = match self {
-            Self::Mix        => Self::Mix,
-            Self::Scene(s)   => Self::Scene(*s),
-            Self::Track(0)   => Self::Mix,
-            Self::Track(t)   => Self::Track(*t - 1),
-            Self::Clip(t, s) => Self::Clip(t.saturating_sub(1), *s),
-        }
-    }
-}
-
-/// Scene methods
-impl ArrangerFocus {
-    pub fn scene (&self) -> Option<usize> {
-        match self {
-            Self::Clip(_, s) => Some(*s),
-            Self::Scene(s)   => Some(*s),
-            _ => None
-        }
-    }
-    pub fn scene_next (&mut self, last_scene: usize) {
-        *self = match self {
-            Self::Mix        => Self::Scene(0),
-            Self::Track(t)   => Self::Scene(*t),
-            Self::Scene(s)   => Self::Scene(last_scene.min(*s + 1)),
-            Self::Clip(t, s) => Self::Clip(*t, last_scene.min(*s + 1)),
-        }
-    }
-    pub fn scene_prev (&mut self) {
-        *self = match self {
-            Self::Mix        => Self::Mix,
-            Self::Track(t)   => Self::Track(*t),
-            Self::Scene(0)   => Self::Mix,
-            Self::Scene(s)   => Self::Scene(*s - 1),
-            Self::Clip(t, s) => Self::Clip(*t, s.saturating_sub(1)),
-        }
-    }
-}
-
-/// Represents the tracks and scenes of the composition.
 impl Arranger {
     pub fn new () -> Self {
         Self {
@@ -100,6 +22,8 @@ impl Arranger {
             selected: ArrangerFocus::Mix,
             scenes:   vec![],
             tracks:   vec![],
+            entered:  true,
+            focused:  true,
         }
     }
     pub fn activate (&mut self) {
@@ -226,3 +150,85 @@ impl Arranger {
         //}
     }
 }
+
+#[derive(PartialEq)]
+/// Represents the current user selection in the arranger
+pub enum ArrangerFocus {
+    /// The whole mix is selected
+    Mix,
+    /// A track is selected.
+    Track(usize),
+    /// A scene is selected.
+    Scene(usize),
+    /// A clip (track × scene) is selected.
+    Clip(usize, usize),
+}
+
+/// Identification methods
+impl ArrangerFocus {
+    pub fn is_track (&self) -> bool {
+        match self { Self::Track(_) => true, _ => false }
+    }
+    pub fn is_scene (&self) -> bool {
+        match self { Self::Scene(_) => true, _ => false }
+    }
+    pub fn is_clip (&self) -> bool {
+        match self { Self::Clip(_, _) => true, _ => false }
+    }
+}
+
+/// Track methods
+impl ArrangerFocus {
+    pub fn track (&self) -> Option<usize> {
+        match self {
+            Self::Clip(t, _) => Some(*t),
+            Self::Track(t)   => Some(*t),
+            _ => None
+        }
+    }
+    pub fn track_next (&mut self, last_track: usize) {
+        *self = match self {
+            Self::Mix        => Self::Track(0),
+            Self::Track(t)   => Self::Track(last_track.min(*t + 1)),
+            Self::Scene(s)   => Self::Clip(0, *s),
+            Self::Clip(t, s) => Self::Clip(last_track.min(*t + 1), *s),
+        }
+    }
+    pub fn track_prev (&mut self) {
+        *self = match self {
+            Self::Mix        => Self::Mix,
+            Self::Scene(s)   => Self::Scene(*s),
+            Self::Track(0)   => Self::Mix,
+            Self::Track(t)   => Self::Track(*t - 1),
+            Self::Clip(t, s) => Self::Clip(t.saturating_sub(1), *s),
+        }
+    }
+}
+
+/// Scene methods
+impl ArrangerFocus {
+    pub fn scene (&self) -> Option<usize> {
+        match self {
+            Self::Clip(_, s) => Some(*s),
+            Self::Scene(s)   => Some(*s),
+            _ => None
+        }
+    }
+    pub fn scene_next (&mut self, last_scene: usize) {
+        *self = match self {
+            Self::Mix        => Self::Scene(0),
+            Self::Track(t)   => Self::Scene(*t),
+            Self::Scene(s)   => Self::Scene(last_scene.min(*s + 1)),
+            Self::Clip(t, s) => Self::Clip(*t, last_scene.min(*s + 1)),
+        }
+    }
+    pub fn scene_prev (&mut self) {
+        *self = match self {
+            Self::Mix        => Self::Mix,
+            Self::Track(t)   => Self::Track(*t),
+            Self::Scene(0)   => Self::Mix,
+            Self::Scene(s)   => Self::Scene(*s - 1),
+            Self::Clip(t, s) => Self::Clip(*t, s.saturating_sub(1)),
+        }
+    }
+}