From f12a58463cbe1eb423ee4ff4153a34e67ad51845 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 3 Apr 2025 03:45:05 +0300 Subject: [PATCH] remove some height overrides --- app/src/view.rs | 2 +- app/src/view/view_ports.rs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/view.rs b/app/src/view.rs index 1cb88eed..e46382db 100644 --- a/app/src/view.rs +++ b/app/src/view.rs @@ -62,7 +62,7 @@ impl<'a> ArrangerView<'a> { width_mid: app.w_tracks_area(), width_side: app.w_sidebar(), - inputs_height: app.h_inputs(), + inputs_height: app.h_inputs().saturating_sub(1), inputs_count: app.midi_ins.len(), outputs_height: app.h_outputs().saturating_sub(1), diff --git a/app/src/view/view_ports.rs b/app/src/view/view_ports.rs index 0fc74dae..20bb3d0c 100644 --- a/app/src/view/view_ports.rs +++ b/app/src/view/view_ports.rs @@ -21,7 +21,7 @@ impl<'a> ArrangerView<'a> { } fn input_ports (&'a self) -> impl Content + 'a { - Tryptich::top(self.inputs_count as u16) + Tryptich::top(1) .left(self.width_side, button_3("i", "midi ins", format!("{}", self.inputs_count), self.is_editing)) .right(self.width_side, @@ -76,17 +76,17 @@ impl<'a> ArrangerView<'a> { } fn output_nexts (&'a self) -> impl Content + 'a { - Fixed::y(1, Tryptich::top(2) + Tryptich::top(2) .left(self.width_side, Align::ne("From:")) .middle(self.width_mid, per_track_top( self.width_mid, ||self.tracks_with_sizes_scrolled(), |_, _|{ Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default()))) - }))) + })) } fn output_froms (&'a self) -> impl Content + 'a { - Fixed::y(1, Tryptich::top(2) + Tryptich::top(2) .left(self.width_side, Align::ne("Next:")) .middle(self.width_mid, per_track_top( self.width_mid, @@ -99,10 +99,10 @@ impl<'a> ArrangerView<'a> { .map(|clip|clip.read().unwrap().name.clone())) .flatten().as_ref()))), Thunk::new(||Tui::bg(Reset, " ------ ")) - )))) + ))) } fn output_ports (&'a self) -> impl Content + 'a { - Fixed::y(3, Tryptich::top(1) + Tryptich::top(1) .left(self.width_side, button_3("o", "midi outs", format!("{}", self.outputs_count), self.is_editing)) .right(self.width_side, @@ -121,10 +121,10 @@ impl<'a> ArrangerView<'a> { let mute = Tui::fg_bg(mute, bg_1, "Play "); let solo = Tui::fg_bg(solo, bg_1, "Solo "); wrap(bg_1, Tui::g(224), Tui::bold(true, Fill::x(Bsp::e(mute, solo)))) - }))) + })) } fn output_conns (&'a self) -> impl Content + 'a { - Fixed::y(3, Tryptich::top(self.outputs_height) + Tryptich::top(self.outputs_height) .left(self.width_side, io_ports(Tui::g(224), Tui::g(32), ||self.app.outputs_with_sizes())) .middle(self.width_mid, per_track_top( @@ -134,6 +134,6 @@ impl<'a> ArrangerView<'a> { t.color.dark.rgb, t.color.darker.rgb, ||self.app.outputs_with_sizes() - )))) + ))) } }