diff options
Diffstat (limited to 'gtk2_ardour/crossfade_view.cc')
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 22119721ff..1b5f4d886a 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -52,7 +52,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), - xf->length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), + xf->length(), false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), crossfade (xf), left_view (lview), right_view (rview) @@ -69,7 +69,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; - set_y_position_and_height (0, get_time_axis_view().height); + set_y_position_and_height (0, get_time_axis_view().current_height()); /* no frame around the xfade or overlap rects */ @@ -109,15 +109,12 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) void CrossfadeView::set_y_position_and_height (double y, double h) { - if (h == TimeAxisView::hSmaller || h == TimeAxisView::hSmall) { - TimeAxisViewItem::set_y_position_and_height (y, h - 3 ); + if (h <= TimeAxisView::hSmaller) { + TimeAxisViewItem::set_y_position_and_height (y, h - 3); } else { TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 ); } - _y_position = y; - _height = h; - redraw_curves (); } @@ -163,8 +160,10 @@ CrossfadeView::redraw_curves () At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the track is either Small or Smaller. */ - double const tav_height = get_time_axis_view().height; - if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) { + + double tav_height = get_time_axis_view().current_height(); + if (tav_height == TimeAxisView::hSmaller || + tav_height == TimeAxisView::hSmall) { h = tav_height - 3.0; } else { h = tav_height - NAME_HIGHLIGHT_SIZE - 3.0; |