smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

UI tweak for the spacer at the bottom of the master bus.

Browse source
This commit is contained in:
Ben Loftis 2016-12-12 12:16:43 -06:00
parent e9deb82ef6
commit afa6720288
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gtk2_ardour/mixer_strip.cc
View file

@ -152,7 +152,6 @@ MixerStrip::init ()
ignore_toggle = false; ignore_toggle = false;
comment_area = 0; comment_area = 0;
_width_owner = 0; _width_owner = 0;
spacer = 0;
/* the length of this string determines the width of the mixer strip when it is set to `wide' */ /* the length of this string determines the width of the mixer strip when it is set to `wide' */
longest_label = "longest label"; longest_label = "longest label";
@ -322,6 +321,15 @@ MixerStrip::init ()
global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
} }
//add a spacer underneath the master bus;
//this fills the area that is taken up by the scrollbar on the tracks;
//and therefore keeps the faders "even" across the bottom
HScrollbar scrollbar;
Gtk::Requisition requisition(scrollbar.size_request ());
int scrollbar_height = requisition.height;
spacer.set_size_request (-1, scrollbar_height+2); //+2 is a fudge factor to accomodate extra padding in mixer strip
global_vpacker.pack_end (spacer, false, false);
global_frame.add (global_vpacker); global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_shadow_type (Gtk::SHADOW_IN);
global_frame.set_name ("BaseFrame"); global_frame.set_name ("BaseFrame");
@ -557,15 +565,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
} }
if (_mixer_owned && route()->is_master() ) { if (_mixer_owned && route()->is_master() ) {
spacer.show();
HScrollbar scrollbar; } else {
Gtk::Requisition requisition(scrollbar.size_request ()); spacer.hide();
int scrollbar_height = requisition.height;
spacer = manage (new EventBox);
spacer->set_size_request (-1, scrollbar_height+2);
global_vpacker.pack_start (*spacer, false, false);
spacer->show();
} }
if (is_track()) { if (is_track()) {

2
gtk2_ardour/mixer_strip.h
View file

@ -166,7 +166,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
ArdourButton width_button; ArdourButton width_button;
ArdourButton number_label; ArdourButton number_label;
Gtk::HBox width_hide_box; Gtk::HBox width_hide_box;
Gtk::EventBox* spacer; Gtk::EventBox spacer;
void hide_clicked(); void hide_clicked();
bool width_button_pressed (GdkEventButton *); bool width_button_pressed (GdkEventButton *);