modifications to region drag implementation

(1) if we're dragging over the drop zone, then x-axis motion is irrelevant for threshold-of-move
(2) store original time axis view of a dragged region so that if we create a new track with the region drag, it can be the same height
This commit is contained in:
Paul Davis 2014-06-19 11:16:27 -04:00
parent 7f63055578
commit cca9f676a1
2 changed files with 25 additions and 14 deletions

View file

@ -247,7 +247,7 @@ class RegionDrag;
class DraggingView
{
public:
DraggingView (RegionView *, RegionDrag *);
DraggingView (RegionView *, RegionDrag *, TimeAxisView* original_tav);
RegionView* view; ///< the view
/** index into RegionDrag::_time_axis_views of the view that this region is currently being displayed on,
@ -264,6 +264,7 @@ public:
framepos_t initial_end; ///< initial end position of the region
framepos_t anchored_fade_length; ///< fade_length when anchored during drag
boost::shared_ptr<ARDOUR::Playlist> initial_playlist;
TimeAxisView* initial_time_axis_view;
};
/** Abstract base class for drags that involve region(s) */
@ -381,7 +382,7 @@ private:
void collect_new_region_view (RegionView *);
RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr<ARDOUR::Region>);
RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr<ARDOUR::Region>, TimeAxisView* original);
bool _copy;
RegionView* _new_region_view;