unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-06 19:56:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: fixing sequencer

Browse source
This commit is contained in:
🪞👃🪞 2024-09-28 20:38:01 +03:00
parent cd0b8a6812
commit 0b5ed23ea6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/tek_sequencer/src/main_arranger.rs
View file

@ -74,7 +74,7 @@ impl Content for ArrangerStandalone<Tui> {
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {
Layers::new(move|add|{ Layers::new(move|add|{
add(&Stack::down(move|add|{ add(&Stack::down(move|add|{
add(&(&self.transport as &dyn Widget<Engine = Tui>).debug())?; add(&self.transport)?;
if let (Some(direction), Some(sequencer)) = ( if let (Some(direction), Some(sequencer)) = (
self.show_sequencer, self.show_sequencer,
self.arranger.sequencer(), self.arranger.sequencer(),

14
crates/tek_sequencer/src/sequencer.rs
View file

@ -1340,16 +1340,16 @@ impl Content for Sequencer<Tui> {
SequenceNoteRange, SequenceNoteRange,
); );
let content = lay!( let content = lay!(
SequenceKeys(&self), SequenceKeys(&self).fill_y(),
self.phrase.as_ref().map(|phrase|SequenceTimer(&self, phrase.clone())), self.phrase.as_ref().map(|phrase|SequenceTimer(&self, phrase.clone()).fill_x()),
SequenceNotes(&self), SequenceNotes(&self).fill_x(),
SequenceCursor(&self), SequenceCursor(&self),
SequenceZoom(&self), SequenceZoom(&self),
); );
row!(toolbar, content) row!(toolbar, content)
.min_y(10) .fill_x()
.inset_x(1) //.inset_x(1)
.background(Color::Red) .background(Color::Rgb(50,40,30))
} }
} }
@ -1605,7 +1605,7 @@ impl<'a> Widget for SequenceKeys<'a> {
if area.h() < 2 { if area.h() < 2 {
return Ok(()) 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|{ to.buffer_update(area, &|cell, x, y|{
let y = y + self.0.note_axis.start as u16; let y = y + self.0.note_axis.start as u16;
if x < self.0.keys.area.width && y < self.0.keys.area.height { if x < self.0.keys.area.width && y < self.0.keys.area.height {