diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-14 21:46:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-14 21:46:32 +0000 |
| commit | 00cba5aa3b4691e44502187f1c9f491c3392d61f (patch) | |
| tree | a6e76d6fa1768e6598cc0040d15fbfd2994bf9e4 /gtk2_ardour/automation_time_axis.cc | |
| parent | 2bc6b777c66d80e544300963c920caa912e9695b (diff) | |
more substantive reworkings of TimeAxisView::name_(entry|label) and name editing. better, but i can still (somehow) trigger occasional misbehaviour
git-svn-id: svn://localhost/ardour2/branches/3.0@13840 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 618344fcbc..bfc0ce4440 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -153,11 +153,6 @@ AutomationTimeAxisView::AutomationTimeAxisView ( set_height (preset_height (HeightNormal)); } - /* for automation tracks, the label does not swap with an entry box. remove all that stuff */ - if (name_label.get_parent()) { - hide_name_label (); - } - name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); name_label.set_name (X_("TrackParameterName")); @@ -175,6 +170,8 @@ AutomationTimeAxisView::AutomationTimeAxisView ( 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); + name_label.show (); + if (_controller) { _controller.get()->set_size_request(-1, 24); /* add bar controller */ @@ -422,15 +419,11 @@ AutomationTimeAxisView::set_height (uint32_t h) first_call_to_set_height = false; if (h >= preset_height (HeightNormal)) { - show_name_label (); - hide_name_entry (); auto_button.show(); hide_button.show_all(); } else if (h >= preset_height (HeightSmall)) { controls_table.hide_all (); - hide_name_entry (); - hide_name_label (); auto_button.hide(); } } |