diff --git a/src/arrange.rs b/src/arrange.rs index 2e5b9bbb..d93501e9 100644 --- a/src/arrange.rs +++ b/src/arrange.rs @@ -158,6 +158,11 @@ pub trait ClipsView: TracksView + ScenesView { Self::H_SCENE as usize } as u16; + let is_selected = + self.selection().track() == Some(track_index) && + self.selection().scene() == Some(scene_index) && + self.is_editing(); + to.place(&wh_exact(w, y, below( wh_full(Outer(true, Style::default().fg(outline))), wh_full(below( @@ -165,9 +170,7 @@ pub trait ClipsView: TracksView + ScenesView { fg_bg(outline, bg, wh_full("")), wh_full(origin_nw(fg_bg(fg, bg, bold(true, name)))), ), - wh_full(when(self.selection().track() == Some(track_index) - && self.selection().scene() == Some(scene_index) - && self.is_editing(), self.editor()))))))); + wh_full(when(is_selected, self.editor().view()))))))); }) } @@ -693,7 +696,7 @@ impl Arrangement { h_exact(h - 1, wh_full(origin_nw(thunk(|to: &mut Tui|{ for (_index, port) in self.midi_outs().iter().enumerate() { to.place(&h_exact(1,w_full(east( - origin_w(east(" ● ", fg(Rgb(255,255,255),bold(true, port.port_name())))), + origin_w(east(" ● ", fg(Rgb(255,255,255), bold(true, port.port_name())))), w_full(origin_e(format!("{}/{} ", port.port().get_connections().len(), port.connections.len()))))))); diff --git a/src/tek.rs b/src/tek.rs index f398bf27..89e49323 100644 --- a/src/tek.rs +++ b/src/tek.rs @@ -75,7 +75,8 @@ pub extern crate tengri; pub(crate) use tengri::{ *, lang::*, - play::*, + exit::*, + eval::*, keys::*, sing::*, time::*, @@ -722,8 +723,7 @@ impl Understand for App { } } fn app_understand_expr (state: &App, to: &mut Tui, lang: &impl Expression) -> Usually<()> { - if evaluate_output_expression(state, to, lang)? - || evaluate_output_expression_tui(state, to, lang)? { + if eval_view(state, to, lang)? || eval_view_tui(state, to, lang)? { Ok(()) } else { Err(format!("App::understand_expr: unexpected: {lang:?}").into()) diff --git a/tengri b/tengri index 30d378a6..a06ea2ac 160000 --- a/tengri +++ b/tengri @@ -1 +1 @@ -Subproject commit 30d378a6ee8a998b3c4437a4c2e83f56b370ac1d +Subproject commit a06ea2ac139d09ab9eba5931455c43a3a75f4151