From 2ed8fd272346b38375ddcc41eb604a4d6eea39d0 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 3 Apr 2021 22:19:33 +0200 Subject: [PATCH] Pixel-pushing: vertically align special busses The mixer's track area has a border with shadow (again). This breaks vertical alignment with monitor-section, master, foldback busses. --- gtk2_ardour/foldback_strip.cc | 1 + gtk2_ardour/mixer_strip.cc | 1 + gtk2_ardour/mixer_ui.cc | 6 +----- gtk2_ardour/monitor_section.cc | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc index c6999c7920..d39c7bb4e1 100644 --- a/gtk2_ardour/foldback_strip.cc +++ b/gtk2_ardour/foldback_strip.cc @@ -491,6 +491,7 @@ FoldbackStrip::init () scrollbar.ensure_style (); Gtk::Requisition requisition (scrollbar.size_request ()); scrollbar_height = requisition.height; + scrollbar_height += 3; // track_display_frame border/shadow } _spacer.set_size_request (-1, scrollbar_height); _global_vpacker.pack_end (_spacer, false, false); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 69cf10b44b..3e83d63e0f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -347,6 +347,7 @@ MixerStrip::init () scrollbar.ensure_style(); Gtk::Requisition requisition(scrollbar.size_request ()); scrollbar_height = requisition.height; + scrollbar_height += 3; // track_display_frame border/shadow } spacer.set_size_request (-1, scrollbar_height); global_vpacker.pack_end (spacer, false, false); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 7ffbf2451d..bb9b4c8f8d 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -2844,13 +2844,9 @@ Mixer_UI::setup_track_display () track_display_scroller.add (track_display); track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - VBox* v = manage (new VBox); - v->show (); - v->pack_start (track_display_scroller, true, true); - track_display_frame.set_name("BaseFrame"); track_display_frame.set_shadow_type (Gtk::SHADOW_IN); - track_display_frame.add (*v); + track_display_frame.add (track_display_scroller); track_display_scroller.show(); track_display_frame.show(); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 2e25854dfd..e42de6bac1 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -426,6 +426,7 @@ MonitorSection::MonitorSection () scrollbar.ensure_style(); Gtk::Requisition requisition(scrollbar.size_request ()); scrollbar_height = requisition.height; + scrollbar_height += 3; // track_display_frame border/shadow } // output port select