- controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- controls_table.attach (name_label, 0, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- controls_table.attach (auto_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ controls_table.set_border_width (1);
+ controls_table.remove (name_hbox);
+ controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
+ controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+
+ Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea());
+ Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea());
+
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&parent);
+ // TODO use rtv->controls_base_unselected_name
+ // subscribe to route_active_changed, ...
+ if (rtv && rtv->is_audio_track()) {
+ blank0->set_name ("AudioTrackControlsBaseUnselected");
+ }
+ else if (rtv && rtv->is_midi_track()) {
+ blank0->set_name ("MidiTrackControlsBaseUnselected");
+ }
+ else {
+ blank0->set_name ("AudioBusControlsBaseUnselected");
+ }
+ blank0->set_size_request (-1, -1);
+ blank1->set_size_request (1, 0);
+ VSeparator* separator = manage (new VSeparator());
+ separator->set_name("TrackSeparator");
+ separator->set_size_request (1, -1);
+
+ controls_button_size_group->add_widget(hide_button);
+ controls_button_size_group->add_widget(*blank0);
+
+ time_axis_hbox.pack_start (*blank0, false, false);
+ time_axis_hbox.pack_start (*separator, false, false);
+ time_axis_hbox.reorder_child (*blank0, 0);
+ time_axis_hbox.reorder_child (*separator, 1);
+ time_axis_hbox.reorder_child (time_axis_vbox, 2);
+
+ if (!ARDOUR::Profile->get_mixbus() ) {
+ time_axis_hbox.pack_start (*blank1, false, false);
+ }