diff options
| author | Ben Loftis <ben@glw.com> | 2012-12-10 20:08:36 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-12-10 20:08:36 +0000 |
| commit | 014540a096fc9ce56a1510f90e394b20760a6978 (patch) | |
| tree | b14cafb905e0335bc9d0bd563563eb3dfff4037e /gtk2_ardour/automation_time_axis.cc | |
| parent | 00e1b1410c98e96a283ff4f4ab87dad2f8d1e5a2 (diff) | |
tweak to plugin parameter sliders in mixer strips
git-svn-id: svn://localhost/ardour2/branches/3.0@13631 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 262f495f84..498832da02 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -153,16 +153,9 @@ AutomationTimeAxisView::AutomationTimeAxisView ( set_height (preset_height (HeightNormal)); } - /* rearrange the name display */ - - controls_table.remove (name_hbox); - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0); - - /* we never show these for automation tracks, so make - life easier and remove them. - */ - - hide_name_entry(); + /* for automation tracks, the label does not swap with an entry box. remove all that stuff */ + if ( name_label.get_parent() ) + name_hbox.remove(name_label); name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); @@ -178,12 +171,13 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* add the buttons */ controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (auto_button, 6, 8, 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); if (_controller) { _controller.get()->set_size_request(-1, 24); /* add bar controller */ - controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.attach (*_controller.get(), 1, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); /* note that this handler connects *before* the default handler */ _controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false); } @@ -427,21 +421,15 @@ AutomationTimeAxisView::set_height (uint32_t h) first_call_to_set_height = false; if (h >= preset_height (HeightNormal)) { - hide_name_entry (); - show_name_label (); - name_hbox.show_all (); - + name_label.show(); auto_button.show(); hide_button.show_all(); } else if (h >= preset_height (HeightSmall)) { controls_table.hide_all (); hide_name_entry (); - show_name_label (); - name_hbox.show_all (); - + name_label.hide(); auto_button.hide(); - hide_button.hide(); } } |