diff options
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 13 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 1 |
4 files changed, 11 insertions, 7 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index a8faaf7ed4..6115986995 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -217,7 +217,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) v->pack_start (*manage (new Label ("")), true, true); v->show (); h->show (); - controls_hbox.pack_start(*v, false, false); + top_hbox.pack_start(*v, false, false); controls_ebox.set_name ("MidiTrackControlsBaseUnselected"); controls_base_selected_name = "MidiTrackControlsBaseSelected"; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 5fa2e6989e..49f5d0d6c1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -200,7 +200,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt) Gtk::VBox *mtrbox = manage(new Gtk::VBox()); mtrbox->pack_start(gm.get_level_meter(), false, false, 2); - controls_hbox.pack_end(*mtrbox, false, false, 4); + top_hbox.pack_end(*mtrbox, false, false, 4); mtrbox->show(); _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context()); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index b8be4955f8..66e9101e42 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -146,20 +146,23 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie separator->set_size_request(-1, 1); separator->show(); - controls_vbox.pack_start (controls_table, false, false); - controls_vbox.show (); - name_vbox.pack_start (name_table, false, false); name_vbox.show (); - controls_hbox.pack_start (controls_vbox, false, false); + controls_hbox.pack_start (controls_table, false, false); controls_hbox.show (); controls_hbox.pack_start (name_vbox, true, true); controls_hbox.show (); + controls_vbox.pack_start (controls_hbox, false, false); + controls_vbox.show (); + + top_hbox.pack_start (controls_vbox, true, true); + top_hbox.show (); + //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected"); - controls_ebox.add (controls_hbox); + controls_ebox.add (top_hbox); controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK| Gdk::BUTTON_RELEASE_MASK| Gdk::POINTER_MOTION_MASK| diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 2560005a89..5ac78a402a 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -209,6 +209,7 @@ class TimeAxisView : public virtual AxisView Gtk::VBox name_vbox; Gtk::VBox time_axis_vbox; Gtk::HBox name_hbox; + Gtk::HBox top_hbox; Gtk::Label name_label; bool _name_editing; uint32_t height; /* in canvas units */ |