Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 728a92bc0917eb308fd53698eb742494ac8eee54..c545a02b464451fe1747be91f8ac818e2ddf9470 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -105,7 +105,6 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
 
        set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME);
        set_name ("CrossfadeEditWindow");
-       set_position (Gtk::WIN_POS_MOUSE);
 
        add_accel_group (ActionManager::ui_manager->get_accel_group());
 
@@ -141,14 +140,12 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
        toplevel->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
 
        fade[Out].line = new ArdourCanvas::PolyLine (canvas->root());
-       fade[Out].line->set_outline_width (1);
        fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
 
        fade[Out].shading = new ArdourCanvas::Polygon (canvas->root());
        fade[Out].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading());
 
        fade[In].line = new ArdourCanvas::PolyLine (canvas->root());
-       fade[In].line->set_outline_width (1);
        fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
 
        fade[In].shading = new ArdourCanvas::Polygon (canvas->root());
@@ -468,7 +465,6 @@ CrossfadeEditor::make_point ()
        p->box->set_fill (true);
        p->box->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointFill());
        p->box->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointOutline());
-       p->box->set_outline_width (1);
 
        p->curve = fade[current].line;
 
@@ -1175,9 +1171,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
                        waveview->set_outline_color (color);
                        waveview->set_fill_color (color);
 
-                       if (which == In) {
-                               waveview->set_region_start (region->start());
-                       } else {
+                       if (which != In) {
                                waveview->set_region_start (region->start() + region->length() - xfade->length());
                        }