13
0

Tweak ARV waveform colors to match new transparency model

This commit is contained in:
Robin Gareus 2022-12-10 01:16:06 +01:00
parent fc53754055
commit a0d36a03b4
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04

View File

@ -1604,18 +1604,18 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& wa
/* set outline */ /* set outline */
outline = UIConfiguration::instance().color ("waveform outline"); outline = UIConfiguration::instance().color ("waveform outline");
if (_selected) { if (_dragging) {
outline = UINT_RGBA_CHANGE_A(outline, 0xC0);
fill = UINT_RGBA_CHANGE_A(fill, 0xC0);
} else if (_selected) {
outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform outline"), 0xC0); outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform outline"), 0xC0);
fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform fill"), 0xC0); fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform fill"), 0xC0);
} else if (_dragging) {
outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 0xC0);
fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 0xC0);
} else if (_region->muted()) { } else if (_region->muted()) {
outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 80); outline = UINT_RGBA_CHANGE_A(outline, 0x40);
fill = UINT_INTERPOLATE(fill_color, UIConfiguration::instance().color ("covered region"), 0.7); fill = UINT_RGBA_CHANGE_A (UINT_INTERPOLATE(fill_color, UIConfiguration::instance().color ("covered region"), 0.7), 0x40);
} else if (!_region->opaque() && trackview.layer_display () != Stacked) { } else if (!_region->opaque() && trackview.layer_display () != Stacked) {
outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 70); outline = UINT_RGBA_CHANGE_A(outline, 0x80);
fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 70); fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 0x80);
} }
/* recorded region, override to red */ /* recorded region, override to red */