diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index afe5948ac3..db6c7bbcb0 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -87,7 +87,6 @@ AutomationRegionView::init (bool /*wfd*/) set_height (trackview.current_height()); - fill_color_name = "midi frame base"; set_colors (); } @@ -110,12 +109,11 @@ uint32_t AutomationRegionView::get_fill_color() const { const std::string mod_name = (_dragging ? "dragging region" : - trackview.editor().internal_editing() ? "editable region" : - "midi frame base"); + trackview.editor().internal_editing() ? "editable region" : fill_color_name); if (_selected) { return UIConfiguration::instance().color_mod ("selected region base", mod_name); } else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) { - return UIConfiguration::instance().color_mod ("midi frame base", mod_name); + return UIConfiguration::instance().color_mod (fill_color_name, mod_name); } return UIConfiguration::instance().color_mod (fill_color, mod_name); } diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index f5158a041a..d62bf0c646 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -164,13 +164,14 @@ AudioGhostRegion::set_colors () if (is_automation_ghost()) { fill_color = UIConfiguration::instance().color ("ghost track wave fill"); + fill_color = UIConfiguration::instance().color_mod("ghost track wave fill", "region alpha"); } else { fill_color = source_track_color(200); } for (uint32_t n=0; n < waves.size(); ++n) { - waves[n]->set_outline_color (UIConfiguration::instance().color ("ghost track wave")); + waves[n]->set_outline_color (UIConfiguration::instance().color_mod ("ghost track wave", "region alpha")); waves[n]->set_fill_color (fill_color); waves[n]->set_clip_color (UIConfiguration::instance().color ("ghost track wave clip")); waves[n]->set_zero_color (UIConfiguration::instance().color ("ghost track zero line")); diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index f79e068d4d..079a9b9fa3 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -262,8 +262,6 @@ MidiRegionView::init (bool /*wfd*/) _model = midi_region()->midi_source(0)->model(); assert (_model); - fill_color_name = "midi frame base"; - RegionView::init (false); //set_height (trackview.current_height()); @@ -3700,7 +3698,7 @@ MidiRegionView::get_fill_color() const if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && !UIConfiguration::instance().get_color_regions_using_track_color()) { - return UIConfiguration::instance().color_mod ("midi frame base", mod_name); + return UIConfiguration::instance().color_mod (fill_color_name, mod_name); } return UIConfiguration::instance().color_mod (fill_color, mod_name);