change packing so number_label shares space with name_label

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 49f5d0d6c106ac0563858aac2f8c7daa20d9ac0c..e819f9ec44c9cfe55679d89d83081f1b2748782a 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -108,7 +108,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , gm (sess, true, 75, 20)
        , _ignore_set_layer_display (false)
 {
-       number_label.set_name("tracknumber label");
+       number_label.set_name("route button");
        number_label.set_alignment(.5, .5);
 
        sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
@@ -366,15 +366,16 @@ RouteTimeAxisView::update_track_number_visibility ()
        }
 
        if (number_label.get_parent()) {
-               controls_table.remove (number_label);
+               name_hbox.remove (number_label);
        }
        if (show_label) {
-               controls_table.resize ( 2, 4 );
-               controls_table.attach (number_label, 3, 4, 0, 1,  Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+//             controls_table.resize ( 2, 4 );
+               name_hbox.pack_start(number_label, false, false, 2);
+//             controls_table.attach (number_label, 3, 4, 0, 1,  Gtk::SHRINK, Gtk::SHRINK, 0, 0);
                number_label.set_size_request(3 + _session->track_number_decimals() * 8, -1);
                number_label.show ();
        } else {
-               controls_table.resize ( 2, 3 );
+//             controls_table.resize ( 2, 3 );
                number_label.hide ();
        }
 }

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 66e9101e4275f20abf35e4666186add45156bd2b..aeb1ff41df6dc311bcfac4a7a1ab98fa38a11e30 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -125,7 +125,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
        delete an_entry;
 
-       name_hbox.pack_start (name_label, true, true);
+       name_hbox.pack_end (name_label, true, true);
        name_hbox.show ();
        name_label.show ();
 
@@ -617,7 +617,7 @@ TimeAxisView::begin_name_edit ()
                        name_hbox.remove (name_label);
                }
                
-               name_hbox.pack_start (*name_entry, false, false);
+               name_hbox.pack_end (*name_entry, false, false);
                name_entry->show ();
 
                name_entry->select_region (0, -1);
@@ -662,7 +662,7 @@ TimeAxisView::end_name_edit (int response)
 
        /* put the name label back */
 
-       name_hbox.pack_start (name_label);
+       name_hbox.pack_end (name_label);
        name_label.show ();
 
        if (edit_next) {