diff --git a/crates/tek_core/src/render_axis.rs b/crates/tek_core/src/render_axis.rs index 33a38a9f..0a0c5055 100644 --- a/crates/tek_core/src/render_axis.rs +++ b/crates/tek_core/src/render_axis.rs @@ -1,5 +1,3 @@ -use crate::*; - macro_rules! impl_axis_common { ($A:ident $T:ty) => { impl $A<$T> { pub fn start_inc (&mut self) -> $T { diff --git a/crates/tek_sequencer/src/arranger.rs b/crates/tek_sequencer/src/arranger.rs index e46fb7aa..f0509a44 100644 --- a/crates/tek_sequencer/src/arranger.rs +++ b/crates/tek_sequencer/src/arranger.rs @@ -7,18 +7,18 @@ use tek_core::Direction; pub struct Arranger { /// Name of arranger pub name: String, - /// Display mode of arranger - pub mode: ArrangerViewMode, - /// Currently selected element. - pub selected: ArrangerFocus, /// Collection of tracks. pub tracks: Vec, /// Collection of scenes. pub scenes: Vec, + /// Currently selected element. + pub selected: ArrangerFocus, + /// Display mode of arranger + pub mode: ArrangerViewMode, + + pub focused: bool, pub entered: bool, - pub transport: Option>>, - pub show_sequencer: Option, pub focus_sequencer: bool, pub modal: Option>, } @@ -33,8 +33,6 @@ impl Arranger { tracks: vec![], entered: true, focused: true, - transport: None, - show_sequencer: Some(Direction::Down), focus_sequencer: false, modal: None } diff --git a/crates/tek_sequencer/src/arranger_view_v.rs b/crates/tek_sequencer/src/arranger_view_v.rs index 52c7c9d2..101505cd 100644 --- a/crates/tek_sequencer/src/arranger_view_v.rs +++ b/crates/tek_sequencer/src/arranger_view_v.rs @@ -162,7 +162,7 @@ impl<'a> Render for TracksHeader<'a> { if x > width { break } - track.name.blit(buf, offset + x, y, Some(Style::default()))?; + track.name.blit(buf, offset + x + 1, y, Some(Style::default()))?; } Ok(Rect { x: area.x, y, width, height: 2 }) }