From 1966d32f73d4938bd2b06da65748d3a33517569c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 16 Sep 2014 13:31:24 -0400 Subject: [PATCH] Revert "don't clamp wave-fill alpha value when using region color" This reverts commit 4af3e01974265a0f08ca0b09ca8dd66751fe115a. Probably don't want this for Tracks. --- gtk2_ardour/audio_region_view.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 4c8282b9f7..aa02daae20 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1409,6 +1409,13 @@ AudioRegionView::set_some_waveform_colors (vector& wave } else { outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(); fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); + + if (ARDOUR_UI::config()->get_color_regions_using_track_color()) { + /* just use a slightly transparent version of the selected + * color so that some of the track color bleeds through + */ + fill = UINT_RGBA_CHANGE_A (fill, 217); + } } } else { if (_recregion) { @@ -1422,6 +1429,13 @@ AudioRegionView::set_some_waveform_colors (vector& wave } else { outline = ARDOUR_UI::config()->get_canvasvar_WaveForm(); fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); + + if (ARDOUR_UI::config()->get_color_regions_using_track_color()) { + /* just use a slightly transparent version of the selected + * color so that some of the track color bleeds through + */ + fill = UINT_RGBA_CHANGE_A (fill, 217); + } } } }