Modified patch from drmoore to fix mantis 2808 (drag rectangle left behind after...

[ardour.git] / gtk2_ardour / crossfade_view.cc

diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index 8507d5e4d9eca8c5047248c8faa29c7621caa480..63c2115b87427842865f217bf9985fdec173d538 100644 (file)
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include <ardour/region.h>
+#include "ardour/region.h"
 #include <gtkmm2ext/doi.h>
 
 #include "canvas-simplerect.h"
@@ -80,7 +80,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        vestigial_frame->hide();
        show_vestigial = false;
        
-       group->signal_event().connect (bind (mem_fun (tv.editor, &PublicEditor::canvas_crossfade_view_event), group, this));
+       group->signal_event().connect (bind (mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this));
        
        crossfade_changed (Change (~0));
 
@@ -174,8 +174,8 @@ CrossfadeView::redraw_curves ()
                return;
        }
 
-       npoints = get_time_axis_view().editor.frame_to_pixel (crossfade->length());
-       npoints = std::min (gdk_screen_width(), npoints);
+       npoints = get_time_axis_view().editor().frame_to_pixel (crossfade->length());
+       // npoints = std::min (gdk_screen_width(), npoints);
 
        if (!_visible || !crossfade->active() || npoints < 3) {
                fade_in->hide();
@@ -190,10 +190,11 @@ CrossfadeView::redraw_curves ()
        vec = new float[npoints];
 
        crossfade->fade_in().curve().get_vector (0, crossfade->length(), vec, npoints);
+
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
+               p.set_y(2.0 + h - (h * vec[i]));
        }
        fade_in->property_points() = *points;
 
@@ -201,7 +202,7 @@ CrossfadeView::redraw_curves ()
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
+               p.set_y(2.0 + h - (h * vec[i]));
        }
        fade_out->property_points() = *points;