diff --git a/crates/tek_sequencer/src/main_arranger.rs b/crates/tek_sequencer/src/main_arranger.rs index 111e65c8..7aa27e16 100644 --- a/crates/tek_sequencer/src/main_arranger.rs +++ b/crates/tek_sequencer/src/main_arranger.rs @@ -74,7 +74,7 @@ impl Content for ArrangerStandalone { fn content (&self) -> impl Widget { Layers::new(move|add|{ add(&Stack::down(move|add|{ - add(&(&self.transport as &dyn Widget).debug())?; + add(&self.transport)?; if let (Some(direction), Some(sequencer)) = ( self.show_sequencer, self.arranger.sequencer(), diff --git a/crates/tek_sequencer/src/sequencer.rs b/crates/tek_sequencer/src/sequencer.rs index 250967c2..ec720ff4 100644 --- a/crates/tek_sequencer/src/sequencer.rs +++ b/crates/tek_sequencer/src/sequencer.rs @@ -1340,16 +1340,16 @@ impl Content for Sequencer { SequenceNoteRange, ); let content = lay!( - SequenceKeys(&self), - self.phrase.as_ref().map(|phrase|SequenceTimer(&self, phrase.clone())), - SequenceNotes(&self), + SequenceKeys(&self).fill_y(), + self.phrase.as_ref().map(|phrase|SequenceTimer(&self, phrase.clone()).fill_x()), + SequenceNotes(&self).fill_x(), SequenceCursor(&self), SequenceZoom(&self), ); row!(toolbar, content) - .min_y(10) - .inset_x(1) - .background(Color::Red) + .fill_x() + //.inset_x(1) + .background(Color::Rgb(50,40,30)) } } @@ -1605,7 +1605,7 @@ impl<'a> Widget for SequenceKeys<'a> { if area.h() < 2 { return Ok(()) } - let area = [area.x(), area.y() + 1, 5, area.h() - 2]; + let area = [area.x(), area.y(), 5, area.h() - 2]; to.buffer_update(area, &|cell, x, y|{ let y = y + self.0.note_axis.start as u16; if x < self.0.keys.area.width && y < self.0.keys.area.height {