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

Do not shade transparent regions in Layered mode

Browse source 
There already is a shaded coverage frame indicating
if a layer is audible. This leads to a more consistent view.

In addition changing layered mode now has to update the
colors (set_frame_color).
This commit is contained in:
Robin Gareus 2022-12-09 05:29:33 +01:00
parent 6c524b3f3b
commit 0bb81a9a18
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
9 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gtk2_ardour/audio_region_view.cc
View file

@ -372,6 +372,22 @@ AudioRegionView::fade_out_active_changed ()
}
}
uint32_t
AudioRegionView::get_fill_color () const
{
Gtkmm2ext::Color f = TimeAxisViewItem::get_fill_color();
char const *modname;
const bool opaque = _region->opaque() || trackview.layer_display () == Stacked;
if (opaque && ( !_dragging && !_region->muted () )) {
modname = "opaque region base";
} else {
modname = "transparent region base";
}
return Gtkmm2ext::HSV(f).mod (UIConfiguration::instance().modifier (modname)).color ();
}
void
AudioRegionView::region_scale_amplitude_changed ()
@ -1597,7 +1613,7 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& wa
} 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);
} else if (!_region->opaque()) {
} 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);
}