ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

shuffle packing order to accomodate midi controls

Browse Source
This commit is contained in:
Ben Loftis 2014-08-11 14:44:12 -05:00
parent bf034f48ce
commit b41df8e120
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/midi_time_axis.cc
View File

@ -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";

2
gtk2_ardour/route_time_axis.cc
View File

@ -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());

13
gtk2_ardour/time_axis_view.cc
View File

@ -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|

1
gtk2_ardour/time_axis_view.h
View File

@ -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 */