reunify ArrangerView

This commit is contained in:
🪞👃🪞 2024-07-08 21:32:20 +03:00
parent b01863dfdc
commit 5a2261d146
2 changed files with 132 additions and 177 deletions

View file

@ -20,94 +20,46 @@ render!(App |self, buf, area| {
let Rect { x, y, width, height } = area;
let transport = TransportView::new(self).render(buf, area)?;
let y = y + transport.height;
let arranger = if self.arranger_mode {
self.draw_arranger_horizontal(buf, Rect {
x, y, width, height: height / 3
})?
let arranger = Rect { x, y, width, height };
let arranger = ArrangerView::new(&self, !self.arranger_mode).render(buf, arranger)?;
let style_entered = if self.entered {
Style::default().green()
} else {
self.draw_arranger_vertical(buf, Rect {
x, y, width, height: height / 3
})?
Style::default().green().dim()
};
if self.section == AppSection::Arranger {
QuarterV(if self.entered {
Style::default().green()
} else {
Style::default().green().dim()
}).draw(buf, arranger)
QuarterV(style_entered).draw(buf, arranger)
}
let y = y + arranger.height;
if self.track_cursor > 0 {
let chain = ChainView::new(&self, false).render(buf, Rect {
x, y: y + height - height / 3 - 1, width, height: height / 3
})?;
let chain = Rect { x, y: y + height - height / 3 - 1, width, height: height / 3 };
let chain = ChainView::new(&self, false).render(buf, chain)?;
if self.section == AppSection::Chain {
QuarterV(if self.entered {
Style::default().green()
} else {
Style::default().green().dim()
}).draw(buf, Rect { width, ..chain })
QuarterV(style_entered).draw(buf, Rect { width, ..chain })
}
let phrase = SequencerView::new(&self).render(buf, Rect {
x, y, width, height: height - height / 3
})?;
let phrase = Rect { x, y, width, height: height - height / 3 };
let phrase = SequencerView::new(&self).render(buf, phrase)?;
if self.section == AppSection::Sequencer {
QuarterV(if self.entered {
Style::default().green()
} else {
Style::default().green().dim()
}).draw(buf, phrase)
QuarterV(style_entered).draw(buf, phrase)
}
chain
} else {
self.draw_mixer(buf, Rect {
x, y, width, height
})?
let area = Rect { x, y, width, height };
let mut x = area.x;
for track in self.tracks.iter() {
track.name.blit(buf, x + 1, area.y, Some(Style::default().white().bold()));
let chain = Rect { x, y: area.y + 1, width: width, height: height - y - 1 };
x = x + ChainView {
focused: self.section == AppSection::Chain,
track: Some(track),
vertical: true,
}
.render(buf, chain)?
.width
.max(track.name.len() as u16);
}
};
if let Some(ref modal) = self.modal {
modal.render(buf, area)?;
}
Ok(area)
});
impl App {
fn draw_mixer (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let mut x = area.x;
for track in self.tracks.iter() {
track.name.blit(buf, x + 1, area.y, Some(Style::default().white().bold()));
x = x + ChainView {
focused: self.section == AppSection::Chain,
track: Some(track),
vertical: true,
}
.render(buf, Rect {
x, y: area.y + 1, width: area.width, height: area.height - area.y - 1
})?
.width
.max(track.name.len() as u16);
}
Ok(area)
}
fn draw_arranger_horizontal (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
ArrangerViewHorizontal {
buf,
area,
focused: self.section == AppSection::Arranger,
entered: self.entered,
scenes: &self.scenes,
tracks: &self.tracks,
cursor: &(self.track_cursor, self.scene_cursor),
}.draw()
}
fn draw_arranger_vertical (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
ArrangerViewVertical {
buf,
area,
focused: self.section == AppSection::Arranger,
entered: self.entered,
scenes: &self.scenes,
tracks: &self.tracks,
cursor: &(self.track_cursor, self.scene_cursor),
}.draw()
}
}