Make drag selection work properly with stacked region mode.

git-svn-id: svn://localhost/ardour2/branches/3.0@5607 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 19 insertions, 2 deletions

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index fbd48ddbf2..afa41d6f90 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -514,10 +514,27 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
 }
 
 void
-StreamView::get_selectables (nframes_t start, nframes_t end, list<Selectable*>& results)
+StreamView::get_selectables (nframes_t start, nframes_t end, double top, double bottom, list<Selectable*>& results)
 {
+	layer_t min_layer = 0;
+	layer_t max_layer = 0;
+	
+	if (_layer_display == Stacked) {
+		double const c = child_height ();
+		min_layer = _layers - ((bottom - _trackview.y_position()) / c);
+		max_layer = _layers - ((top - _trackview.y_position()) / c);
+	}
+	
 	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-		if ((*i)->region()->coverage(start, end) != OverlapNone) {
+
+		bool layer_ok = true;
+
+		if (_layer_display == Stacked) {
+			layer_t const l = (*i)->region()->layer ();
+			layer_ok = (min_layer <= l && l <= max_layer);
+		}
+		
+		if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
 			results.push_back (*i);
 		}
 	}