diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
| commit | 580520b12f90251e38d94a1a5d6a199b76142b0b (patch) | |
| tree | a20b79ac88794d4d92b88569e643ff67b515d6c3 /gtk2_ardour/time_axis_view.cc | |
| parent | 0947791a800aa20ee0ea6a0334c789ab7a34fa90 (diff) | |
| parent | b649f0a21b711c68cba5e26945650fd36f657268 (diff) | |
fix conflicts caused by meterbridge merge
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index bea828a6ad..bb7d8c9eef 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -132,12 +132,18 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_table.set_no_show_all (); HSeparator* separator = manage (new HSeparator()); + separator->set_name("TrackSeparator"); + separator->set_size_request(-1, 1); + separator->show(); controls_vbox.pack_start (controls_table, false, false); controls_vbox.show (); + controls_hbox.pack_start (controls_vbox, true, true); + controls_hbox.show (); + //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected"); - controls_ebox.add (controls_vbox); + controls_ebox.add (controls_hbox); controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK| Gdk::BUTTON_RELEASE_MASK| Gdk::POINTER_MOTION_MASK| @@ -154,10 +160,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_ebox.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave)); controls_ebox.show (); - controls_hbox.pack_start (controls_ebox, true, true); - controls_hbox.show (); - - time_axis_vbox.pack_start (controls_hbox, true, true); + time_axis_vbox.pack_start (controls_ebox, true, true, 0); time_axis_vbox.pack_end (*separator, false, false); time_axis_vbox.show(); |