region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / crossfade_view.cc

diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index cf19137d988271c55faf64d9c7e8cfe0499147b4..8507d5e4d9eca8c5047248c8faa29c7621caa480 100644 (file)
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -31,6 +31,7 @@
 #include "audio_region_view.h"
 #include "utils.h"
 #include "canvas_impl.h"
+#include "ardour_ui.h"
 
 using namespace sigc;
 using namespace ARDOUR;
@@ -51,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)
@@ -61,14 +62,14 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        _visible = true;
 
        fade_in = new Line (*group);
-       fade_in->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+       fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
        fade_in->property_width_pixels() = 1;
 
        fade_out = new Line (*group);
-       fade_out->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+       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_height (get_time_axis_view().current_height());
 
        /* no frame around the xfade or overlap rects */
 
@@ -106,17 +107,14 @@ CrossfadeView::reset_width_dependent_items (double pixel_width)
 }
 
 void
-CrossfadeView::set_y_position_and_height (double y, double h)
+CrossfadeView::set_height (double height)
 {
-       if (h == TimeAxisView::hSmaller || h == TimeAxisView::hSmall) {
-               TimeAxisViewItem::set_y_position_and_height (y, h - 3 );
+       if (height <= TimeAxisView::hSmaller) {
+               TimeAxisViewItem::set_height (height - 3);
        } else {
-               TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 );
+               TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 );
        }
 
-       _y_position = y;
-       _height = h;
-
        redraw_curves ();
 }
 
@@ -162,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;
@@ -220,9 +220,9 @@ void
 CrossfadeView::active_changed ()
 {
        if (crossfade->active()) {
-               frame->property_fill_color_rgba() = Config->canvasvar_ActiveCrossfade.get();
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
        } else {
-               frame->property_fill_color_rgba() = Config->canvasvar_InactiveCrossfade.get();
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
        }
 
        redraw_curves ();