unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-08 04:36:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove single-use horizontal arranger widgets

Browse source
This commit is contained in:
🪞👃🪞 2024-10-03 20:23:35 +03:00
parent 4be2df1347
commit 6f91eb085d
2 changed files with 226 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -346,27 +346,6 @@ pub struct VerticalArrangerCursor<'a>(
pub struct HorizontalArranger<'a, E: Engine>(
pub &'a Arranger<E>
);
pub struct TrackNameColumn<'a, E: Engine>(
pub &'a [Sequencer<E>], pub ArrangerFocus
);
pub struct TrackMonitorColumn<'a, E: Engine>(
pub &'a [Sequencer<E>]
);
pub struct TrackRecordColumn<'a, E: Engine>(
pub &'a [Sequencer<E>]
);
pub struct TrackOverdubColumn<'a, E: Engine>(
pub &'a [Sequencer<E>]
);
pub struct TrackEraseColumn<'a, E: Engine>(
pub &'a [Sequencer<E>]
);
pub struct TrackGainColumn<'a, E: Engine>(
pub &'a [Sequencer<E>]
);
pub struct TrackScenesColumn<'a, E: Engine>(
pub &'a [Sequencer<E>], pub &'a [Scene], pub ArrangerFocus
);
///////////////////////////////////////////////////////////////////////////////////////////////////

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

@ -354,30 +354,15 @@ impl<'a> Content for HorizontalArranger<'a, Tui> {
type Engine = Tui;
fn content (&self) -> impl Widget<Engine = Tui> {
let Arranger { tracks, focused, selected, scenes, .. } = self.0;
let tracks = tracks.as_slice();
Layers::new(|add|{
add(&focused.then_some(Background(Color::Rgb(40, 50, 30))))?;
add(&Stack::right(|add|{
add(&TrackNameColumn(tracks, *selected))?;
add(&TrackMonitorColumn(tracks))?;
add(&TrackRecordColumn(tracks))?;
add(&TrackOverdubColumn(tracks))?;
add(&TrackEraseColumn(tracks))?;
add(&TrackGainColumn(tracks))?;
add(&TrackScenesColumn(tracks, scenes.as_slice(), *selected))?;
Ok(())
}))
})
}
}
impl<'a> Widget for TrackNameColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
let _tracks = tracks.as_slice();
lay!(
focused.then_some(Background(Color::Rgb(40, 50, 30))),
row!(
// name
CustomWidget::new(|_|{
todo!()
}, |_: &mut TuiOutput|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks, selected) = self;
//let yellow = Some(Style::default().yellow().bold().not_dim());
//let white = Some(Style::default().white().bold().not_dim());
@ -398,22 +383,12 @@ impl<'a> Widget for TrackNameColumn<'a, Tui> {
//}
//}
//Ok(Some(area))
}
}
pub fn track_name_max_len <E: Engine> (tracks: &[Sequencer<E>]) -> usize {
tracks.iter()
.map(|s|s.name.read().unwrap().len())
.fold(0, usize::max)
}
impl<'a> Widget for TrackMonitorColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}),
// monitor
CustomWidget::new(|_|{
todo!()
}, |_: &mut TuiOutput|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks) = self;
//let mut area = to.area();
//let on = Some(Style::default().not_dim().green().bold());
@ -435,16 +410,12 @@ impl<'a> Widget for TrackMonitorColumn<'a, Tui> {
//}
//area.width = 4;
//Ok(Some(area))
}
}
impl<'a> Widget for TrackRecordColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}),
// record
CustomWidget::new(|_|{
todo!()
}, |_: &mut TuiOutput|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks) = self;
//let mut area = to.area();
//let on = Some(Style::default().not_dim().red().bold());
@ -466,16 +437,12 @@ impl<'a> Widget for TrackRecordColumn<'a, Tui> {
//}
//area.width = 4;
//Ok(Some(area))
}
}
impl<'a> Widget for TrackOverdubColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}),
// overdub
CustomWidget::new(|_|{
todo!()
}, |_: &mut TuiOutput|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks) = self;
//let mut area = to.area();
//let on = Some(Style::default().not_dim().yellow().bold());
@ -500,16 +467,16 @@ impl<'a> Widget for TrackOverdubColumn<'a, Tui> {
//}
//area.width = 4;
//Ok(Some(area))
}
}
impl<'a> Widget for TrackEraseColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}),
// erase
CustomWidget::new(|_|{
todo!()
}, |_: &mut TuiOutput|{
todo!()
}),
// gain
CustomWidget::new(|_|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks) = self;
//let mut area = to.area();
//let off = Some(Style::default().dim());
@ -529,16 +496,8 @@ impl<'a> Widget for TrackEraseColumn<'a, Tui> {
//}
//area.width = 4;
//Ok(Some(area))
}
}
impl<'a> Widget for TrackGainColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}, |_: &mut TuiOutput|{
todo!()
}
fn render (&self, _to: &mut TuiOutput) -> Usually<()> {
todo!();
//let Self(tracks) = self;
//let mut area = to.area();
//let off = Some(Style::default().dim());
@ -558,16 +517,12 @@ impl<'a> Widget for TrackGainColumn<'a, Tui> {
//}
//area.width = 7;
//Ok(Some(area))
}
}
impl<'a> Widget for TrackScenesColumn<'a, Tui> {
type Engine = Tui;
fn layout (&self, _to: [u16;2]) -> Perhaps<[u16;2]> {
}),
// scenes
CustomWidget::new(|_|{
todo!()
}
fn render (&self, to: &mut TuiOutput) -> Usually<()> {
let Self(tracks, scenes, selected) = self;
}, |to: &mut TuiOutput|{
let Arranger { tracks, scenes, selected, .. } = self.0;
let area = to.area();
let mut x2 = 0;
let [x, y, _, height] = area;
@ -604,9 +559,18 @@ impl<'a> Widget for TrackScenesColumn<'a, Tui> {
}
//Ok(Some([x, y, x2, height]))
Ok(())
}),
)
)
}
}
pub fn track_name_max_len <E: Engine> (tracks: &[Sequencer<E>]) -> usize {
tracks.iter()
.map(|s|s.name.read().unwrap().len())
.fold(0, usize::max)
}
///////////////////////////////////////////////////////////////////////////////////////////////////
impl Content for ArrangerRenameModal<Tui> {
@ -800,16 +764,23 @@ impl Sequencer<Tui> {
impl Content for Sequencer<Tui> {
type Engine = Tui;
fn content (&self) -> impl Widget<Engine = Tui> {
let toolbar = col!(
col! { "Name", self.name.read().unwrap().as_str(), },
"",
col! { "Start: ", " 1.1.1", "End: ", " 2.1.1", },
"",
col! { "Loop [ ]", "From: ", " 1.1.1", "Length: ", " 1.0.0", },
"",
col! { "Notes: ", "C#0-C#9 ", "[ /2 ]", "[ x2 ]"
, "[ Rev ]", "[ Inv ]", "[ Dup ]" },
).min_x(10);
let toolbar = Stack::down(move|add|{
add(&col! {"Name", self.name.read().unwrap().as_str(),})?;
if let Some(phrase) = self.phrase.as_ref() {
panic!();
let phrase = phrase.read().unwrap();
let length = phrase.length;
let looped = phrase.looped;
add(&"")?;
add(&col! {"Length: ", format!("{length}").as_str(),})?;
add(&"")?;
add(&col! { "Loop [ ]", "From: ", " 1.1.1", "Length: ", " 1.0.0", })?;
add(&"")?;
add(&col! { "Notes: ", "C#0-C#9 ", "[ /2 ]", "[ x2 ]"
, "[ Rev ]", "[ Inv ]", "[ Dup ]" })?;
}
Ok(())
}).min_x(10);
let content = lay!(
// keys
CustomWidget::new(|_|Ok(Some([32,4])), |to: &mut TuiOutput|{