From 516bf1fa17a828931a5639ad69520911abd9c999 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 10 Dec 2022 01:53:28 +0100 Subject: [PATCH] Set "opaque region base" alpha to 1.0 --- gtk2_ardour/audio_region_view.cc | 7 ++----- gtk2_ardour/midi_region_view.cc | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d1244352be..2f3a937722 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -376,17 +376,14 @@ 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"; + return f; } 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 diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 079a9b9fa3..89b5969c5d 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3689,19 +3689,22 @@ MidiRegionView::get_fill_color() const const std::string mod_name = _dragging ? "dragging 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) { - 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) && - !UIConfiguration::instance().get_color_regions_using_track_color()) { - return UIConfiguration::instance().color_mod (fill_color_name, mod_name); + if (mod_name.empty ()) { + return c; + } else { + return UIConfiguration::instance().color_mod (c, mod_name); } - - return UIConfiguration::instance().color_mod (fill_color, mod_name); } void