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

allow 3 sequencers to be focused

Browse source
This commit is contained in:
🪞👃🪞 2024-06-20 19:38:47 +03:00
parent 225c686db9
commit 228805d30d
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/layout.rs
View file

@ -57,7 +57,7 @@ impl Device for Rows {
width: area.width, width: area.width,
height: area.height - h height: area.height - h
})?; })?;
if self.focused && i == self.focus { if !self.focused && i == self.focus {
draw_box_styled(buf, result, Some(Style::default().green().dim().bold())); draw_box_styled(buf, result, Some(Style::default().green().dim().bold()));
} }
w = w.max(result.width); w = w.max(result.width);
@ -85,8 +85,24 @@ impl Columns {
} }
impl Device for Columns { impl Device for Columns {
fn handle (&mut self, event: &AppEvent) -> Usually<bool> { fn handle (&mut self, event: &AppEvent) -> Usually<bool> {
Ok(self.items[self.focus].handle(event)? || match event { let focused = match self.focused {
true => Some(self.items.get_mut(self.focus).unwrap()),
false => None
};
let handled = if let Some(item) = focused {
item.handle(event)?
} else {
false
};
if handled {
return Ok(true);
}
Ok(match event {
AppEvent::Input(event) => match event { AppEvent::Input(event) => match event {
Event::Key(KeyEvent { code: KeyCode::Left, .. }) => { Event::Key(KeyEvent { code: KeyCode::Left, .. }) => {
if self.focus == 0 { if self.focus == 0 {
@ -103,12 +119,12 @@ impl Device for Columns {
true true
}, },
Event::Key(KeyEvent { code: KeyCode::Enter, .. }) => { Event::Key(KeyEvent { code: KeyCode::Enter, .. }) => {
self.focused = false; self.focused = true;
self.items[self.focus].handle(&AppEvent::Focus)?; self.items[self.focus].handle(&AppEvent::Focus)?;
true true
}, },
Event::Key(KeyEvent { code: KeyCode::Esc, .. }) => { Event::Key(KeyEvent { code: KeyCode::Esc, .. }) => {
self.focused = true; self.focused = false;
self.items[self.focus].handle(&AppEvent::Blur)?; self.items[self.focus].handle(&AppEvent::Blur)?;
true true
}, },
@ -117,6 +133,7 @@ impl Device for Columns {
_ => false _ => false
}) })
} }
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> { fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let mut w = 0u16; let mut w = 0u16;
let mut h = 0u16; let mut h = 0u16;
@ -127,7 +144,7 @@ impl Device for Columns {
width: area.width - w, width: area.width - w,
height: area.height height: area.height
})?; })?;
if self.focused && i == self.focus { if !self.focused && i == self.focus {
draw_box_styled(buf, result, Some(Style::default().green())); draw_box_styled(buf, result, Some(Style::default().green()));
} }
w = w + result.width; w = w + result.width;

4
src/main.rs
View file

@ -23,9 +23,9 @@ fn main () -> Result<(), Box<dyn Error>> {
//crate::device::run(Sequencer::new("Rhythm#000")?) //crate::device::run(Sequencer::new("Rhythm#000")?)
let transport = Transport::new("Transport")?; let transport = Transport::new("Transport")?;
let timebase = transport.state.lock().unwrap().timebase(); let timebase = transport.state.lock().unwrap().timebase();
crate::device::run(Rows::new(true, vec![ crate::device::run(Rows::new(false, vec![
Box::new(transport), Box::new(transport),
Box::new(Columns::new(true, vec![ Box::new(Columns::new(false, vec![
Box::new(Sequencer::new("Melody#000", &timebase)?), Box::new(Sequencer::new("Melody#000", &timebase)?),
Box::new(Sequencer::new("Melody#001", &timebase)?), Box::new(Sequencer::new("Melody#001", &timebase)?),
Box::new(Sequencer::new("Rhythm#000", &timebase)?), Box::new(Sequencer::new("Rhythm#000", &timebase)?),