further tweaks pertaining the track-number height
This commit is contained in:
parent
c4be8c2a67
commit
dc02625b56
@ -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_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
|
||||||
number_label.set_alignment(.5, .5);
|
number_label.set_alignment(.5, .5);
|
||||||
number_label.set_fallthrough_to_parent (true);
|
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());
|
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_table.attach (*mute_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
|
||||||
}
|
}
|
||||||
controls_button_size_group->add_widget(*mute_button);
|
controls_button_size_group->add_widget(*mute_button);
|
||||||
|
track_number_v_size_group->add_widget(*mute_button);
|
||||||
|
|
||||||
if (!_route->is_master()) {
|
if (!_route->is_master()) {
|
||||||
if (ARDOUR::Profile->get_mixbus()) {
|
if (ARDOUR::Profile->get_mixbus()) {
|
||||||
@ -418,9 +420,9 @@ RouteTimeAxisView::update_track_number_visibility ()
|
|||||||
}
|
}
|
||||||
if (show_label) {
|
if (show_label) {
|
||||||
if (ARDOUR::Profile->get_mixbus()) {
|
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 {
|
} 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.
|
// 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
|
// except the width of the number label is subtracted from the name-hbox, so we
|
||||||
|
@ -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
|
unsigned int TimeAxisView::name_width_px = 100; // TODO adjust with font-scaling on style-change
|
||||||
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
|
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
|
||||||
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
|
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*/)
|
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
|
||||||
: AxisView (sess)
|
: AxisView (sess)
|
||||||
@ -102,6 +103,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||||||
if (!controls_meters_size_group) {
|
if (!controls_meters_size_group) {
|
||||||
controls_meters_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
|
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) {
|
if (extra_height == 0) {
|
||||||
compute_heights ();
|
compute_heights ();
|
||||||
}
|
}
|
||||||
@ -151,9 +155,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||||||
controls_table.set_border_width (2);
|
controls_table.set_border_width (2);
|
||||||
|
|
||||||
if (ARDOUR::Profile->get_mixbus() ) {
|
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 {
|
} 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.show_all ();
|
||||||
controls_table.set_no_show_all ();
|
controls_table.set_no_show_all ();
|
||||||
|
@ -203,6 +203,7 @@ class TimeAxisView : public virtual AxisView
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
static Glib::RefPtr<Gtk::SizeGroup> controls_meters_size_group;
|
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;
|
static unsigned int name_width_px;
|
||||||
/* The Standard LHS Controls */
|
/* The Standard LHS Controls */
|
||||||
Gtk::Table controls_table;
|
Gtk::Table controls_table;
|
||||||
|
Loading…
Reference in New Issue
Block a user