From a0d36a03b422720dfc4e319776804e93476a9767 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 10 Dec 2022 01:16:06 +0100 Subject: [PATCH] Tweak ARV waveform colors to match new transparency model --- gtk2_ardour/audio_region_view.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 0de714bf13..d1244352be 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1604,18 +1604,18 @@ AudioRegionView::set_some_waveform_colors (vector& wa /* set 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); 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()) { - outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 80); - fill = UINT_INTERPOLATE(fill_color, UIConfiguration::instance().color ("covered region"), 0.7); + outline = UINT_RGBA_CHANGE_A(outline, 0x40); + 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) { - outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 70); - fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 70); + outline = UINT_RGBA_CHANGE_A(outline, 0x80); + fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 0x80); } /* recorded region, override to red */