From 4912409a8d2a587e267185952bb7a8582d142382 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 6 Sep 2014 12:49:57 +0200 Subject: gtk style related fixes: * remove some old/unused styles * fix plugin-ui button (hover color when active) * consistent style for route buttons (and related ArdourButton updates) --- gtk2_ardour/route_time_axis.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/route_time_axis.cc') diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 0e384b6d97..a8ea6bd4e5 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -112,7 +112,6 @@ 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()); } @@ -218,7 +217,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr 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 +416,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::SHRINK, 1, 0); + controls_table.attach (number_label, 3, 4, 0, 1, Gtk::SHRINK, Gtk::EXPAND|Gtk::FILL, 1, 0); } else { - controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 1, 0); + controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::EXPAND|Gtk::FILL, 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 -- cgit v1.2.3