remove some height overrides

This commit is contained in:
🪞👃🪞 2025-04-03 03:45:05 +03:00
parent fe9c1e38a4
commit f12a58463c
2 changed files with 10 additions and 10 deletions

View file

@ -62,7 +62,7 @@ impl<'a> ArrangerView<'a> {
width_mid: app.w_tracks_area(), width_mid: app.w_tracks_area(),
width_side: app.w_sidebar(), width_side: app.w_sidebar(),
inputs_height: app.h_inputs(), inputs_height: app.h_inputs().saturating_sub(1),
inputs_count: app.midi_ins.len(), inputs_count: app.midi_ins.len(),
outputs_height: app.h_outputs().saturating_sub(1), outputs_height: app.h_outputs().saturating_sub(1),

View file

@ -21,7 +21,7 @@ impl<'a> ArrangerView<'a> {
} }
fn input_ports (&'a self) -> impl Content<TuiOut> + 'a { fn input_ports (&'a self) -> impl Content<TuiOut> + 'a {
Tryptich::top(self.inputs_count as u16) Tryptich::top(1)
.left(self.width_side, .left(self.width_side,
button_3("i", "midi ins", format!("{}", self.inputs_count), self.is_editing)) button_3("i", "midi ins", format!("{}", self.inputs_count), self.is_editing))
.right(self.width_side, .right(self.width_side,
@ -76,17 +76,17 @@ impl<'a> ArrangerView<'a> {
} }
fn output_nexts (&'a self) -> impl Content<TuiOut> + 'a { fn output_nexts (&'a self) -> impl Content<TuiOut> + 'a {
Fixed::y(1, Tryptich::top(2) Tryptich::top(2)
.left(self.width_side, Align::ne("From:")) .left(self.width_side, Align::ne("From:"))
.middle(self.width_mid, per_track_top( .middle(self.width_mid, per_track_top(
self.width_mid, self.width_mid,
||self.tracks_with_sizes_scrolled(), ||self.tracks_with_sizes_scrolled(),
|_, _|{ |_, _|{
Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default()))) Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default())))
}))) }))
} }
fn output_froms (&'a self) -> impl Content<TuiOut> + 'a { fn output_froms (&'a self) -> impl Content<TuiOut> + 'a {
Fixed::y(1, Tryptich::top(2) Tryptich::top(2)
.left(self.width_side, Align::ne("Next:")) .left(self.width_side, Align::ne("Next:"))
.middle(self.width_mid, per_track_top( .middle(self.width_mid, per_track_top(
self.width_mid, self.width_mid,
@ -99,10 +99,10 @@ impl<'a> ArrangerView<'a> {
.map(|clip|clip.read().unwrap().name.clone())) .map(|clip|clip.read().unwrap().name.clone()))
.flatten().as_ref()))), .flatten().as_ref()))),
Thunk::new(||Tui::bg(Reset, " ------ ")) Thunk::new(||Tui::bg(Reset, " ------ "))
)))) )))
} }
fn output_ports (&'a self) -> impl Content<TuiOut> + 'a { fn output_ports (&'a self) -> impl Content<TuiOut> + 'a {
Fixed::y(3, Tryptich::top(1) Tryptich::top(1)
.left(self.width_side, .left(self.width_side,
button_3("o", "midi outs", format!("{}", self.outputs_count), self.is_editing)) button_3("o", "midi outs", format!("{}", self.outputs_count), self.is_editing))
.right(self.width_side, .right(self.width_side,
@ -121,10 +121,10 @@ impl<'a> ArrangerView<'a> {
let mute = Tui::fg_bg(mute, bg_1, "Play "); let mute = Tui::fg_bg(mute, bg_1, "Play ");
let solo = Tui::fg_bg(solo, bg_1, "Solo "); let solo = Tui::fg_bg(solo, bg_1, "Solo ");
wrap(bg_1, Tui::g(224), Tui::bold(true, Fill::x(Bsp::e(mute, solo)))) wrap(bg_1, Tui::g(224), Tui::bold(true, Fill::x(Bsp::e(mute, solo))))
}))) }))
} }
fn output_conns (&'a self) -> impl Content<TuiOut> + 'a { fn output_conns (&'a self) -> impl Content<TuiOut> + 'a {
Fixed::y(3, Tryptich::top(self.outputs_height) Tryptich::top(self.outputs_height)
.left(self.width_side, .left(self.width_side,
io_ports(Tui::g(224), Tui::g(32), ||self.app.outputs_with_sizes())) io_ports(Tui::g(224), Tui::g(32), ||self.app.outputs_with_sizes()))
.middle(self.width_mid, per_track_top( .middle(self.width_mid, per_track_top(
@ -134,6 +134,6 @@ impl<'a> ArrangerView<'a> {
t.color.dark.rgb, t.color.dark.rgb,
t.color.darker.rgb, t.color.darker.rgb,
||self.app.outputs_with_sizes() ||self.app.outputs_with_sizes()
)))) )))
} }
} }