diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-05-03 00:08:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-05-03 00:08:14 +0000 |
| commit | d1f58cf5a46eca318d25d762968955edd4fad5a7 (patch) | |
| tree | 66bab4eb430a0d8cb0be7b44272aa684d45dde3a | |
| parent | 6949d3ea622fc1b45e25a51f5eee18406e6a930d (diff) | |
Don't hide solo/mute/rec enable for the smallest track height, as there appears to be no need to (#4014).
git-svn-id: svn://localhost/ardour2/branches/3.0@9462 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 57e5903e82..c3c7e9d1f2 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -862,6 +862,9 @@ RouteTimeAxisView::set_height (uint32_t h) xml_node->add_property ("height", buf); if (height >= preset_height (HeightNormal)) { + + controls_table.set_border_width (2); + reset_meter(); show_name_entry (); hide_name_label (); @@ -885,6 +888,8 @@ RouteTimeAxisView::set_height (uint32_t h) } else if (height >= preset_height (HeightSmaller)) { + controls_table.set_border_width (2); + reset_meter(); show_name_entry (); hide_name_label (); @@ -908,31 +913,8 @@ RouteTimeAxisView::set_height (uint32_t h) } else { - - /* don't allow name_entry to be hidden while - it has focus, otherwise the GUI becomes unusable. - */ - - if (name_entry.has_focus()) { - if (name_entry.get_text() != _route->name()) { - name_entry_changed (); - } - controls_ebox.grab_focus (); - } - - hide_name_entry (); - show_name_label (); - - gm.get_gain_slider().hide(); - mute_button->hide(); - solo_button->hide(); - if (rec_enable_button) - rec_enable_button->hide(); - - route_group_button.hide (); - automation_button.hide (); - playlist_button.hide (); - name_label.set_text (_route->name()); + controls_table.set_border_width (0); + } if (height_changed && !no_redraw) { |