diff options
| author | Ben Loftis <ben@glw.com> | 2012-12-14 19:44:09 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-12-14 19:44:09 +0000 |
| commit | 63a25adb9eff719aa8bb9b96855b239e8c0e0099 (patch) | |
| tree | f26211a9d51fdb43351f7388d6cc272903803120 /gtk2_ardour | |
| parent | b8a8abeb8f35b092deee46179190611ad16deae5 (diff) | |
keep region trim handle layered on top of crossfade area
git-svn-id: svn://localhost/ardour2/branches/3.0@13670 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 26bcad68f8..b1ca071e8a 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -552,6 +552,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, f fade_in_handle->property_x2() = handle_center + handle_size; if (pwidth < 5) { + hide_start_xfade(); fade_in_shape->hide(); return; } @@ -596,13 +597,13 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, f fade_in_shape->property_points() = *points; delete points; + redraw_start_xfade_to ( ar, width); + /* ensure trim handle stays on top */ if (frame_handle_start) { frame_handle_start->raise_to_top(); } - redraw_start_xfade_to ( ar, width); - } void @@ -642,6 +643,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, /* don't show shape if its too small */ if (pwidth < 5) { + hide_end_xfade(); fade_out_shape->hide(); return; } @@ -686,12 +688,13 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, fade_out_shape->property_points() = *points; delete points; + redraw_end_xfade_to (ar, width); + /* ensure trim handle stays on top */ if (frame_handle_end) { frame_handle_end->raise_to_top(); } - redraw_end_xfade_to (ar, width); } framepos_t |