diff --git a/crates/tek_sequencer/src/sequencer_view_h.rs b/crates/tek_sequencer/src/sequencer_view_h.rs index ed85779b..35204c89 100644 --- a/crates/tek_sequencer/src/sequencer_view_h.rs +++ b/crates/tek_sequencer/src/sequencer_view_h.rs @@ -5,11 +5,17 @@ impl Sequencer { const H_KEYS_OFFSET: usize = 5; pub(crate) fn horizontal_draw (&self, buf: &mut Buffer, mut area: Rect) -> Usually<()> { - SequenceStartEnd.render(buf, area)?; - SequenceLoop.render(buf, area)?; - SequenceRange.render(buf, area)?; + Split::down() + .add(SequenceStartEnd) + .add(SequenceLoop) + .add(SequenceRange) + .render(buf, Rect { x: area.x, y: area.y, width: 15, height: area.height })?; + //SequenceRange.render(buf, area)?; area.x = area.x + 15; - area.width = area.width.saturating_sub(12); + area.width = area.width.saturating_sub(15); + Lozenge(Style::default().fg(Nord::BG2)).draw(buf, area)?; + area.x = area.x + 1; + area.width = area.width.saturating_sub(1); SequenceKeys(&self).render(buf, area)?; if let Some(ref phrase) = self.phrase { SequenceTimer(&self, phrase).render(buf, area)?; @@ -38,11 +44,11 @@ struct SequenceLoop; impl Render for SequenceLoop { fn render (&self, buf: &mut Buffer, area: Rect) -> Usually { - let range = Rect { x: area.x, y: area.y + 4, width: 15, height: 5 }; + let range = Rect { x: area.x, y: area.y, width: 15, height: 5 }; Lozenge(Style::default().fg(Nord::BG2)).draw(buf, range)?; - "[ Loop off ] ".blit(buf, area.x + 1, area.y + 5, None)?; - "Loop 1.1.1".blit(buf, area.x + 1, area.y + 6, None)?; - "Length 1.0.0".blit(buf, area.x + 1, area.y + 7, None)?; + "[ Loop off ] ".blit(buf, area.x + 1, area.y + 1, None)?; + "Loop 1.1.1".blit(buf, area.x + 1, area.y + 2, None)?; + "Length 1.0.0".blit(buf, area.x + 1, area.y + 3, None)?; Ok(range) } } @@ -51,13 +57,13 @@ struct SequenceRange; impl Render for SequenceRange { fn render (&self, buf: &mut Buffer, area: Rect) -> Usually { - let range = Rect { x: area.x, y: area.y + 9, width: 15, height: 7 }; + let range = Rect { x: area.x, y: area.y, width: 15, height: 7 }; Lozenge(Style::default().fg(Nord::BG2)).draw(buf, range)?; - "Notes -------".blit(buf, area.x + 1, area.y + 10, None)?; - "[ /2 ] [ x2 ]".blit(buf, area.x + 1, area.y + 11, None)?; - "[ Reverse ]".blit(buf, area.x + 1, area.y + 12, None)?; - "[ Invert ]".blit(buf, area.x + 1, area.y + 13, None)?; - "[ Duplicate ]".blit(buf, area.x + 1, area.y + 14, None)?; + "Notes -------".blit(buf, area.x + 1, area.y + 1, None)?; + "[ /2 ] [ x2 ]".blit(buf, area.x + 1, area.y + 2, None)?; + "[ Reverse ]".blit(buf, area.x + 1, area.y + 3, None)?; + "[ Invert ]".blit(buf, area.x + 1, area.y + 4, None)?; + "[ Duplicate ]".blit(buf, area.x + 1, area.y + 5, None)?; Ok(area) } }