summaryrefslogtreecommitdiff
path: root/gtk2_ardour/automation_time_axis.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-01-18 02:56:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-01-18 02:56:51 +0000
commitfe49c8de182d40528a27b84d5530698f438de51d (patch)
tree0b559f4b38e1a4de686620b7d10972fbf7ceae47 /gtk2_ardour/automation_time_axis.cc
parent67467c92e1c202b762837555aa0daecef1bd6dda (diff)
fix track controls height allocation to be font sensitive; fix core dump related to ownership of size menu; add nudge to keybindings; and more
git-svn-id: svn://localhost/trunk/ardour2@275 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
-rw-r--r--gtk2_ardour/automation_time_axis.cc18
1 files changed, 13 insertions, 5 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index cb30465fca..9fbb9d9232 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -97,7 +97,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
life easier and remove them.
*/
- name_hbox.remove (name_entry);
+ hide_name_entry();
/* move the name label over a bit */
@@ -326,7 +326,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
}
controls_table.show_all ();
- name_label.show ();
+ hide_name_entry ();
+ show_name_label ();
break;
case Large:
@@ -343,7 +344,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
}
controls_table.show_all ();
- name_label.show ();
+ hide_name_entry ();
+ show_name_label ();
break;
case Larger:
@@ -360,7 +362,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
}
controls_table.show_all ();
- name_label.show ();
+ hide_name_entry ();
+ show_name_label ();
break;
case Normal:
@@ -378,7 +381,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
}
controls_table.show_all ();
- name_label.show ();
+ hide_name_entry ();
+ show_name_label ();
break;
case Smaller:
@@ -392,6 +396,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
}
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.hide_all ();
+ hide_name_entry ();
+ show_name_label ();
name_hbox.show_all ();
controls_table.show ();
break;
@@ -407,6 +413,8 @@ AutomationTimeAxisView::set_height (TrackHeight h)
}
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.hide_all ();
+ hide_name_entry ();
+ show_name_label ();
name_hbox.show_all ();
controls_table.show ();
break;