From b1775149307a157444c516693ad6b98a404ef1b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Dec 2011 22:14:15 +0000 Subject: Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it. git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/streamview.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/streamview.cc') diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 06a9d77957..2fce87fa80 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -181,7 +181,7 @@ StreamView::add_region_view (boost::weak_ptr wr) add_region_view_internal (r, true); - if (_layer_display == Stacked) { + if (_layer_display == Stacked || _layer_display == Expanded) { update_contents_height (); } } @@ -301,7 +301,7 @@ StreamView::playlist_layered (boost::weak_ptr wtr) _layers = tr->playlist()->top_layer() + 1; } - if (_layer_display == Stacked || _layer_display == Expanded) { + if (_layer_display == Stacked) { update_contents_height (); update_coverage_frames (); } else { @@ -574,7 +574,7 @@ StreamView::child_height () const case Expanded: return height / (_layers * 2 + 1); } - + /* NOTREACHED */ return height; } -- cgit v1.2.3