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

Set "opaque region base" alpha to 1.0

Browse source
This commit is contained in:
Robin Gareus 2022-12-10 01:53:28 +01:00
parent a0d36a03b4
commit 516bf1fa17
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/audio_region_view.cc
View file

@ -376,17 +376,14 @@ uint32_t
AudioRegionView::get_fill_color () const AudioRegionView::get_fill_color () const
{ {
Gtkmm2ext::Color f = TimeAxisViewItem::get_fill_color(); Gtkmm2ext::Color f = TimeAxisViewItem::get_fill_color();
char const *modname;
const bool opaque = _region->opaque() || trackview.layer_display () == Stacked; const bool opaque = _region->opaque() || trackview.layer_display () == Stacked;
if (opaque && ( !_dragging && !_region->muted () )) { if (opaque && ( !_dragging && !_region->muted () )) {
modname = "opaque region base"; return f;
} else { } else {
modname = "transparent region base"; return Gtkmm2ext::HSV(f).mod (UIConfiguration::instance().modifier ("transparent region base")).color ();
} }
return Gtkmm2ext::HSV(f).mod (UIConfiguration::instance().modifier (modname)).color ();
} }
void void

19
gtk2_ardour/midi_region_view.cc
View file

@ -3689,19 +3689,22 @@ MidiRegionView::get_fill_color() const
const std::string mod_name = _dragging ? "dragging region" : const std::string mod_name = _dragging ? "dragging region" :
trackview.editor().internal_editing() ? "editable region" : trackview.editor().internal_editing() ? "editable region" :
(opaque && !_region->muted ()) ? "opaque region base" : "transparent region base"; (opaque && !_region->muted ()) ? "" : "transparent region base";
Gtkmm2ext::Color c;
if (_selected) { if (_selected) {
return UIConfiguration::instance().color_mod ("selected region base", mod_name); c = UIConfiguration::instance().color ("selected region base");
} else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && !UIConfiguration::instance().get_color_regions_using_track_color()) {
c = UIConfiguration::instance().color (fill_color_name);
} else {
c = fill_color;
} }
if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && if (mod_name.empty ()) {
!UIConfiguration::instance().get_color_regions_using_track_color()) { return c;
return UIConfiguration::instance().color_mod (fill_color_name, mod_name); } else {
return UIConfiguration::instance().color_mod (c, mod_name);
} }
return UIConfiguration::instance().color_mod (fill_color, mod_name);
} }
void void