smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Robin Gareus 2014-09-13 01:46:04 +02:00
parent 3da9c3b740
commit d80e55e828
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/audio_region_view.cc
View file

@ -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);
}
}
}
}

6
gtk2_ardour/default_ui_config.in
View file

@ -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"/>