reset xfade colors after theme change

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 8716653b7108f73fa78edd3f941157c44ad02607..c2fc604849b9522b5a06cb8f144e594e4ed18cc0 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -1020,7 +1020,9 @@ AudioRegionView::set_colors ()
        RegionView::set_colors();
 
        if (gain_line) {
-               gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->get_canvasvar_GainLine() : ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+               gain_line->set_line_color (audio_region()->envelope_active() ? 
+                                          ARDOUR_UI::config()->get_canvasvar_GainLine() : 
+                                          ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
        }
 
        for (uint32_t n=0; n < waves.size(); ++n) {
@@ -1033,6 +1035,25 @@ AudioRegionView::set_colors ()
                waves[n]->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
                waves[n]->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
        }
+
+       if (start_xfade_in) {
+               start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine());
+       }
+       if (start_xfade_out) {
+               start_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine());
+       }
+       if (end_xfade_in) {
+               end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine());
+       }
+       if (end_xfade_out) {
+               end_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine());
+       }
+       if (start_xfade_rect) {
+               start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+       }
+       if (end_xfade_rect) {
+               end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+       }
 }
 
 void

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 0b894d16474ad84eb6019878be23b80c10d205fe..17e07924778ff40e45aa38eefa35a0f2f1b4e6ff 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -93,6 +93,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
 
        line = new ArdourCanvas::Curve (group);
        line->set_data ("line", this);
+       line->set_outline_width (2.0);
 
        line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler));