diff --git a/config/config_arranger.edn b/config/config_arranger.edn index 9d89764a..c2ede8ca 100644 --- a/config/config_arranger.edn +++ b/config/config_arranger.edn @@ -22,12 +22,11 @@ (bsp/a :view-dialog (bsp/w :view-meters-output (bsp/e :view-meters-input - (bsp/n :view-history - (bsp/n (fixed/y 2 :view-status-h2) - (bsp/n :view-tracks-inputs - (bsp/s :view-tracks-devices - (bsp/s :view-tracks-outputs - (bsp/s :view-tracks-names - (fill/xy (either :focus-editor - (bsp/e :view-scenes-names :view-editor) - :view-scenes)))))))))))) + (bsp/n (fixed/y 2 :view-status-h2) + (bsp/n :view-tracks-inputs + (bsp/s :view-tracks-devices + (bsp/s :view-tracks-outputs + (bsp/s :view-tracks-names + (fill/xy (either :focus-editor + (bsp/e :view-scenes-names :view-editor) + :view-scenes))))))))))) diff --git a/crates/app/src/view.rs b/crates/app/src/view.rs index 9381c07f..a358f023 100644 --- a/crates/app/src/view.rs +++ b/crates/app/src/view.rs @@ -8,9 +8,9 @@ impl App { "nil" } pub fn view_history (&self) -> impl Content { - Fill::x(Align::w(self.history.last() - .map(|last|FieldH(self.color, format!("History ({})", self.history.len()), - Fill::x(Align::w(format!("{:?}", last.0))))))); + Fixed::y(1, Fill::x(Align::w(FieldH(self.color, + format!("History ({})", self.history.len()), + self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0)))))))) } pub fn view_status_h2 (&self) -> impl Content + use<'_> { self.update_clock(); @@ -32,7 +32,7 @@ impl App { add(&" "); { let cache = self.view_cache.read().unwrap(); - add(&Fixed::x(13, Align::w(Bsp::s( + add(&Fixed::x(15, Align::w(Bsp::s( FieldH(theme, "Beat", cache.beat.view.clone()), FieldH(theme, "Time", cache.time.view.clone()), )))); @@ -40,14 +40,22 @@ impl App { Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))), Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))), )))); - add(&Fixed::x(13, Align::w(Bsp::s( + add(&Fixed::x(12, Align::w(Bsp::s( Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))), Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))), )))); - add(&Fixed::x(16, FieldV(theme, "Selection", Align::w(self.selection().describe( - self.tracks(), - self.scenes() - ))))); + add(&Bsp::s( + Fill::x(Align::w(FieldH(theme, "Selected", Align::w(self.selection().describe( + self.tracks(), + self.scenes() + ))))), + Fill::x(Align::w(FieldH(theme, format!("History ({})", self.history.len()), + self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))) + )); + //if let Some(last) = self.history.last() { + //add(&FieldV(theme, format!("History ({})", self.history.len()), + //Fill::x(Align::w(format!("{:?}", last.0))))); + //} } })) }