Revert "don't clamp wave-fill alpha value when using region color"

This reverts commit 4af3e01974265a0f08ca0b09ca8dd66751fe115a.

Probably don't want this for Tracks.
This commit is contained in:
Paul Davis 2014-09-16 13:31:24 -04:00
parent f64ebc5a0d
commit 1966d32f73

View file

@ -1409,6 +1409,13 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& 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<ArdourCanvas::WaveView*>& 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);
}
}
}
}