diff options
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/default_ui_config.in | 6 |
2 files changed, 3 insertions, 17 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 6c41272d93..da6aeff7bf 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1413,13 +1413,6 @@ 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) { @@ -1433,13 +1426,6 @@ 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); - } } } } diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in index 74bce74332..959178e1c9 100644 --- a/gtk2_ardour/default_ui_config.in +++ b/gtk2_ardour/default_ui_config.in @@ -122,7 +122,7 @@ <Option name="range drag rect" value="82c696c6"/> <Option name="range marker bar" value="7d7f8ccc"/> <Option name="recording rect" value="cc2828ff"/> - <Option name="recorded waveform fill" value="ffffffff"/> + <Option name="recorded waveform fill" value="ffffffd9"/> <Option name="recorded waveform outline" value="0f0f1fff"/> <Option name="rubber band rect" value="c6c6c659"/> <Option name="ruler base" value="2c2121ff"/> @@ -130,7 +130,7 @@ <Option name="selected crossfade editor line" value="00dbdbff"/> <Option name="selected crossfade editor wave" value="f9ea14a0"/> <Option name="selected region base" value="596559ff"/> - <Option name="selected waveform fill" value="ffa500ff"/> + <Option name="selected waveform fill" value="ffa500d9"/> <Option name="selected waveform outline" value="0f0f0fcc"/> <Option name="selection rect" value="e8f4d377"/> <Option name="selection" value="636363b2"/> @@ -178,7 +178,7 @@ <Option name="region area covered by another region" value="505050b0"/> <Option name="waveform outline" value="000000ff"/> <Option name="clipped waveform" value="ff0000e5"/> - <Option name="waveform fill" value="ffffffff"/> + <Option name="waveform fill" value="ffffffd9"/> <Option name="zero line" value="7f7f7fe0"/> <Option name="zoom rect" value="c6d1b26d"/> <Option name="monitor knob" value="555050ff"/> |