smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

more substantive reworkings of TimeAxisView::name_(entry|label) and name editing. better, but i can still (somehow) trigger occasional misbehaviour

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13840 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-14 21:46:32 +00:00
parent 2bc6b777c6
commit 00cba5aa3b
5 changed files with 166 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/automation_time_axis.cc
View file

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