diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-03 07:36:15 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:06 +0200 |
| commit | aabe526df2c04a21ee8f61f88d4c515fa102d283 (patch) | |
| tree | c71325898bace2a9a49433b934fb6c88f22c69bf /gtk2_ardour | |
| parent | 95e163a466c1c48ae6695663772f9eca94de722a (diff) | |
update track-header layout - proper padding around meters
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 6cb6d451a0..c2922e4f69 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -186,8 +186,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt) } else { gm.set_fader_name ("AudioBusFader"); } - - controls_hbox.pack_start(gm.get_level_meter(), false, false, 2); + + Gtk::VBox *mtrbox = manage(new Gtk::VBox()); + mtrbox->pack_start(gm.get_level_meter(), false, false, 2); + controls_hbox.pack_start(*mtrbox, false, false, 4); + _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context()); _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); @@ -834,7 +837,7 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) void RouteTimeAxisView::set_height (uint32_t h) { - int gmlen = h - 7; + int gmlen = h - 9; bool height_changed = (height == 0) || (h != height); int meter_width = 3; @@ -2242,7 +2245,7 @@ RouteTimeAxisView::reset_meter () if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { meter_width = 6; } - gm.get_level_meter().setup_meters (height-7, meter_width); + gm.get_level_meter().setup_meters (height - 9, meter_width); } else { hide_meter (); } diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 36594b10f7..555efcc2b5 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -138,8 +138,11 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie 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| @@ -156,11 +159,8 @@ 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, 2); time_axis_vbox.pack_end (*separator, false, false); + time_axis_vbox.pack_start (controls_ebox, true, true, 0); time_axis_vbox.show(); ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); |