ardour/livetrax
13
0
Fork 0
Code

further tweaks pertaining the track-number height

Browse Source
This commit is contained in:
Robin Gareus 2014-09-04 19:43:04 +02:00
parent c4be8c2a67
commit dc02625b56
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/route_time_axis.cc
View File

@ -112,6 +112,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
number_label.set_alignment(.5, .5);
number_label.set_fallthrough_to_parent (true);
track_number_v_size_group->add_widget(number_label);
sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
}
@ -217,6 +218,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
controls_table.attach (*mute_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
}
controls_button_size_group->add_widget(*mute_button);
track_number_v_size_group->add_widget(*mute_button);
if (!_route->is_master()) {
if (ARDOUR::Profile->get_mixbus()) {
@ -418,9 +420,9 @@ RouteTimeAxisView::update_track_number_visibility ()
}
if (show_label) {
if (ARDOUR::Profile->get_mixbus()) {
controls_table.attach (number_label, 3, 4, 0, 1, Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 1, 0);
controls_table.attach (number_label, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 1, 0);
} else {
controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 1, 0);
controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 1, 0);
}
// see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
// except the width of the number label is subtracted from the name-hbox, so we

8
gtk2_ardour/time_axis_view.cc
View File

@ -73,6 +73,7 @@ int const TimeAxisView::_max_order = 512;
unsigned int TimeAxisView::name_width_px = 100; // TODO adjust with font-scaling on style-change
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::track_number_v_size_group = Glib::RefPtr<Gtk::SizeGroup>();
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
: AxisView (sess)
@ -102,6 +103,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
if (!controls_meters_size_group) {
controls_meters_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
}
if (!track_number_v_size_group) {
track_number_v_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
}
if (extra_height == 0) {
compute_heights ();
}
@ -151,9 +155,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
controls_table.set_border_width (2);
if (ARDOUR::Profile->get_mixbus() ) {
controls_table.attach (name_hbox, 4, 5, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (name_hbox, 4, 5, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0);
} else {
controls_table.attach (name_hbox, 1, 2, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (name_hbox, 1, 2, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0);
}
controls_table.show_all ();
controls_table.set_no_show_all ();

1
gtk2_ardour/time_axis_view.h
View File

@ -203,6 +203,7 @@ class TimeAxisView : public virtual AxisView
protected:
static Glib::RefPtr<Gtk::SizeGroup> controls_meters_size_group;
static Glib::RefPtr<Gtk::SizeGroup> track_number_v_size_group;
static unsigned int name_width_px;
/* The Standard LHS Controls */
Gtk::Table controls_table;