Cope with drags of selections that include regions on hidden tracks (#3493).

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

2 files changed, 52 insertions, 72 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 70f705d0b6..3b82fa332e 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -411,20 +411,19 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<Re
 {
 	_editor->visible_order_range (&_visible_y_low, &_visible_y_high);
 
-	/* Make a list of non-hidden tracks to refer to during the drag */
+	/* Make a list of tracks to refer to during the drag; we include hidden tracks,
+	   as some of the regions we are dragging may be on such tracks.
+	*/
 
 	TrackViewList track_views = _editor->track_views;
 	track_views.sort (EditorOrderTimeAxisViewSorter ());
 
 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-		if (!(*i)->hidden()) {
-
-			_time_axis_views.push_back (*i);
-
-			TimeAxisView::Children children_list = (*i)->get_child_list ();
-			for (TimeAxisView::Children::iterator j = children_list.begin(); j != children_list.end(); ++j) {
-				_time_axis_views.push_back (j->get());
-			}
+		_time_axis_views.push_back (*i);
+		
+		TimeAxisView::Children children_list = (*i)->get_child_list ();
+		for (TimeAxisView::Children::iterator j = children_list.begin(); j != children_list.end(); ++j) {
+			_time_axis_views.push_back (j->get());
 		}
 	}
 
@@ -451,7 +450,9 @@ RegionDrag::region_going_away (RegionView* v)
 	}
 }
 
-/** Given a non-hidden TimeAxisView, return the index of it into the _time_axis_views vector */
+/** Given a TimeAxisView, return the index of it into the _time_axis_views vector,
+ *  or -1 if it is not found.
+ */
 int
 RegionDrag::find_time_axis_view (TimeAxisView* t) const
 {
@@ -635,49 +636,24 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
 
 		if (first_move) {
 
-			/* here we are calculating the y distance from the
-			   top of the first track view to the top of the region
-			   area of the track view that we're working on */
-
-			/* this x value is just a dummy value so that we have something
-			   to pass to i2w () */
-
-			double ix1 = 0;
-
-			/* distance from the top of this track view to the region area
-			   of our track view is always 1 */
-
-			double iy1 = 1;
-
-			/* convert to world coordinates, ie distance from the top of
-			   the ruler section */
-
-			rv->get_canvas_frame()->i2w (ix1, iy1);
-
-			/* compensate for the ruler section and the vertical scrollbar position */
-			iy1 += _editor->get_trackview_group_vertical_offset ();
-
-			// hide any dependent views
-
 			rv->get_time_axis_view().hide_dependent_views (*rv);
-
-			/*
-			  reparent to a non scrolling group so that we can keep the
-			  region selection above all time axis views.
-			  reparenting means we have to move the rv as the two
-			  parent groups have different coordinates.
+										    
+			/* Reparent to a non scrolling group so that we can keep the
+			   region selection above all time axis views.
+			   Reparenting means that we will have to move the region view
+			   later, as the two parent groups have different coordinates.
 			*/
-
-			rv->get_canvas_group()->property_y() = iy1 - 1;
+			
 			rv->get_canvas_group()->reparent (*(_editor->_region_motion_group));
-
+			
 			rv->fake_set_opaque (true);
+			
+			if (!rv->get_time_axis_view().hidden()) {
+				/* the track that this region view is on is hidden, so hide the region too */
+				rv->get_canvas_group()->hide ();
+			}
 		}
 
-		/* Work out the change in y position of this region view */
-
-		double y_delta = 0;
-
 		/* If we have moved tracks, we'll fudge the layer delta so that the
 		   region gets moved back onto layer 0 on its new track; this avoids
 		   confusion when dragging regions from non-zero layers onto different
@@ -688,33 +664,21 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
 			this_delta_layer = - i->layer;
 		}
 
-		/* Move this region to layer 0 on its old track */
-		StreamView* lv = _time_axis_views[i->time_axis_view]->view ();
-		if (lv->layer_display() == Stacked) {
-			y_delta -= (lv->layers() - i->layer - 1) * lv->child_height ();
-		}
-
-		/* Now move it to its right layer on the current track */
-		StreamView* cv = _time_axis_views[i->time_axis_view + delta_time_axis_view]->view ();
-		if (cv->layer_display() == Stacked) {
-			y_delta += (cv->layers() - (i->layer + this_delta_layer) - 1) * cv->child_height ();
-		}
+		/* The TimeAxisView that this region is now on */
+		TimeAxisView* tv = _time_axis_views[i->time_axis_view + delta_time_axis_view];
+			
+		/* Set height */
+		rv->set_height (tv->view()->child_height ());
 
-		/* Move tracks */
-		if (delta_time_axis_view > 0) {
-			for (int j = 0; j < delta_time_axis_view; ++j) {
-				y_delta += _time_axis_views[i->time_axis_view + j]->current_height ();
-			}
+		/* Update show/hidden status as the region view may have come from a hidden track,
+		   or have moved to one.
+		*/
+		if (tv->hidden ()) {
+			rv->get_canvas_group()->hide ();
 		} else {
-			/* start by subtracting the height of the track above where we are now */
-			for (int j = 1; j <= -delta_time_axis_view; ++j) {
-				y_delta -= _time_axis_views[i->time_axis_view - j]->current_height ();
-			}
+			rv->get_canvas_group()->show ();
 		}
 
-		/* Set height */
-		rv->set_height (_time_axis_views[i->time_axis_view + delta_time_axis_view]->view()->child_height ());
-
 		/* Update the DraggingView */
 		i->time_axis_view += delta_time_axis_view;
 		i->layer += this_delta_layer;
@@ -722,7 +686,21 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
 		if (_brushing) {
 			_editor->mouse_brush_insert_region (rv, pending_region_position);
 		} else {
-			rv->move (x_delta, y_delta);
+			double x = 0;
+			double y = 0;
+
+			/* Get the y coordinate of the top of the track that this region is now on */
+			tv->canvas_display()->i2w (x, y);
+			y += _editor->get_trackview_group_vertical_offset();
+			
+			/* And adjust for the layer that it should be on */
+			StreamView* cv = tv->view ();
+			if (cv->layer_display() == Stacked) {
+				y += (cv->layers() - i->layer - 1) * cv->child_height ();
+			}
+			
+			/* Now move the region view */
+			rv->move (x_delta, y - rv->get_canvas_group()->property_y());
 		}
 
 	} /* foreach region */
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index d4cd5a6a9d..8bc52bc056 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -245,7 +245,9 @@ struct DraggingView
 	DraggingView (RegionView *, RegionDrag *);
 
 	RegionView* view; ///< the view
-	/** index into RegionDrag::_time_axis_views of the view that this region is currently beind displayed on */
+	/** index into RegionDrag::_time_axis_views of the view that this region is currently being displayed on,
+	 *  or -1 if it is not visible.
+	 */
 	int time_axis_view;
 	/** layer that this region is currently being displayed on */
 	ARDOUR::layer_t layer;