diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-08-25 21:53:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-08-25 21:53:21 +0000 |
| commit | 33328b868dd29bfe80c8b4acc664358f8530bcd5 (patch) | |
| tree | 963fa6660d11a645db51543e6e4ad3b9ae906502 | |
| parent | bc18abeba90c22e103824ba59585d3609514e67f (diff) | |
Make fade edits and trim possible on stacked regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@5589 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/audio_region_view.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/region_view.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/region_view.h | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d4e846aec5..42f8fe6d7a 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1360,3 +1360,12 @@ AudioRegionView::set_fade_visibility (bool yn) } } } + +void +AudioRegionView::update_coverage_frames (LayerDisplay d) +{ + RegionView::update_coverage_frames (d); + + fade_in_handle->raise_to_top (); + fade_out_handle->raise_to_top (); +} diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index 826f58dece..cbd9e1f645 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -107,6 +107,7 @@ class AudioRegionView : public RegionView void reset_fade_out_shape_width (nframes_t); void set_fade_visibility (bool); + void update_coverage_frames (LayerDisplay); virtual void entered (); virtual void exited (); diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 7fa453faf7..e79a7134af 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -459,7 +459,7 @@ RegionView::region_sync_changed () /* points set below */ - sync_mark = new ArdourCanvas::Polygon (*group); + sync_mark = new ArdourCanvas::Polygon (*group); sync_mark->property_fill_color_rgba() = fill_color; sync_line = new ArdourCanvas::Line (*group); @@ -647,4 +647,7 @@ RegionView::update_coverage_frames (LayerDisplay d) /* finish off the last rectangle */ cr->property_x2() = trackview.editor().frame_to_pixel (end - position); } + + frame_handle_start->raise_to_top (); + frame_handle_end->raise_to_top (); } diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 98329ee77b..af7cb0369d 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -87,7 +87,7 @@ class RegionView : public TimeAxisViewItem virtual void exited () {} void enable_display(bool yn) { _enable_display = yn; } - void update_coverage_frames (LayerDisplay); + virtual void update_coverage_frames (LayerDisplay); static sigc::signal<void,RegionView*> RegionViewGoingAway; |