From daa46c42254e2cc3da29726a4d21d79ca4b028a5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 13 May 2020 11:22:05 -0600 Subject: [PATCH] the return of waveform outline (tips) color This seems to have been removed unintentionally in 973e9ad132b4 --- gtk2_ardour/audio_region_view.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 8748acc16d..f34dec89ff 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1582,7 +1582,7 @@ AudioRegionView::set_some_waveform_colors (vector& wa fill = UINT_INTERPOLATE (fill, UIConfiguration::instance().color ("waveform fill"), 0.5); /* set outline */ - outline = fill; + outline = UIConfiguration::instance().color ("waveform outline"); if (_selected) { outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform outline"), 0xC0); @@ -1591,10 +1591,10 @@ AudioRegionView::set_some_waveform_colors (vector& wa 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 fill"), 80); + outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 80); fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 0); } else if (!_region->opaque()) { - outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 70); + outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 70); fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), 70); }