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

fix note cursor length and advancement

Browse source
This commit is contained in:
🪞👃🪞 2024-10-23 20:31:20 +03:00
parent 98fa0c4c4f
commit 35599c6cde
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/tek_sequencer/src/arranger.rs
View file

@ -251,9 +251,7 @@ impl<E: Engine> Arrangement<E> {
ArrangementFocus::Track(_) => self.track_width_inc(), ArrangementFocus::Track(_) => self.track_width_inc(),
ArrangementFocus::Scene(_) => self.scene_next(), ArrangementFocus::Scene(_) => self.scene_next(),
ArrangementFocus::Clip(_, _) => self.phrase_next(), ArrangementFocus::Clip(_, _) => self.phrase_next(),
ArrangementFocus::Mix => if let ArrangementViewMode::Vertical(factor) = self.mode { ArrangementFocus::Mix => self.zoom_in(),
self.mode = ArrangementViewMode::Vertical(factor + 1)
}
} }
} }
pub fn decrement (&mut self) { pub fn decrement (&mut self) {
@ -261,16 +259,18 @@ impl<E: Engine> Arrangement<E> {
ArrangementFocus::Track(_) => self.track_width_dec(), ArrangementFocus::Track(_) => self.track_width_dec(),
ArrangementFocus::Scene(_) => self.scene_prev(), ArrangementFocus::Scene(_) => self.scene_prev(),
ArrangementFocus::Clip(_, _) => self.phrase_prev(), ArrangementFocus::Clip(_, _) => self.phrase_prev(),
ArrangementFocus::Mix => if let ArrangementViewMode::Vertical(factor) = self.mode { ArrangementFocus::Mix => self.zoom_out(),
self.mode = ArrangementViewMode::Vertical(factor.saturating_sub(1))
}
} }
} }
pub fn zoom_in (&mut self) { pub fn zoom_in (&mut self) {
todo!("zoom in") if let ArrangementViewMode::Vertical(factor) = self.mode {
self.mode = ArrangementViewMode::Vertical(factor + 1)
}
} }
pub fn zoom_out (&mut self) { pub fn zoom_out (&mut self) {
todo!("zoom in") if let ArrangementViewMode::Vertical(factor) = self.mode {
self.mode = ArrangementViewMode::Vertical(factor.saturating_sub(1))
}
} }
pub fn is_first_row (&self) -> bool { pub fn is_first_row (&self) -> bool {
let selected = self.selected; let selected = self.selected;
@ -380,7 +380,9 @@ impl<E: Engine> Arrangement<E> {
pub fn track_prev (&mut self) { pub fn track_prev (&mut self) {
self.selected.track_prev() self.selected.track_prev()
} }
pub fn track_add (&mut self, name: Option<&str>, color: Option<Color>) -> Usually<&mut ArrangementTrack<E>> { pub fn track_add (
&mut self, name: Option<&str>, color: Option<Color>
) -> Usually<&mut ArrangementTrack<E>> {
self.tracks.push(name.map_or_else( self.tracks.push(name.map_or_else(
|| ArrangementTrack::new(&self.track_default_name(), color), || ArrangementTrack::new(&self.track_default_name(), color),
|name| ArrangementTrack::new(name, color), |name| ArrangementTrack::new(name, color),

4
crates/tek_sequencer/src/sequencer_cmd.rs
View file

@ -127,9 +127,7 @@ impl Handle<Tui> for PhraseEditor<Tui> {
}, },
key!(KeyCode::Char('a')) => if self.entered { key!(KeyCode::Char('a')) => if self.entered {
self.put(); self.put();
self.time_axis.point = self.time_axis.point.map(|time|{ self.time_axis.point = self.time_axis.point.map(|time|{time + self.note_len});
time + self.note_len / self.time_axis.scale
});
}, },
key!(KeyCode::Char('s')) => if self.entered { key!(KeyCode::Char('s')) => if self.entered {
self.put(); self.put();

7
crates/tek_sequencer/src/sequencer_tui.rs
View file

@ -88,10 +88,13 @@ impl Content for PhraseEditor<Tui> {
if *entered { if *entered {
let area = to.area(); let area = to.area();
if let (Some(time), Some(note)) = (time_axis.point, note_axis.point) { if let (Some(time), Some(note)) = (time_axis.point, note_axis.point) {
let x = area.x() + (time / time_axis.scale) as u16; let x1 = area.x() + (time / time_axis.scale) as u16;
let x2 = x1 + (self.note_len / time_axis.scale) as u16;
let y = area.y() + 1 + note as u16 / 2; let y = area.y() + 1 + note as u16 / 2;
let c = if note % 2 == 0 { "▀" } else { "▄" }; let c = if note % 2 == 0 { "▀" } else { "▄" };
to.blit(&c, x, y, Some(Style::default().fg(color))); for x in x1..x2 {
to.blit(&c, x, y, Some(Style::default().fg(color)));
}
} }
} }
Ok(()) Ok(())