13
0

restore apparent thinko that removed the effect of "editable region" transparency for MIDI regions

This commit is contained in:
Paul Davis 2020-05-16 08:29:37 -06:00
parent 852500aa1e
commit eecb498a70

View File

@ -3547,16 +3547,15 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo
uint32_t uint32_t
MidiRegionView::get_fill_color() const MidiRegionView::get_fill_color() const
{ {
const std::string mod_name = (_dragging ? "dragging region" : "midi frame base"); const std::string mod_name = (_dragging ? "dragging region" :
trackview.editor().internal_editing() ? "editable region" :
"midi frame base");
if (_selected) { if (_selected) {
if (!trackview.editor().internal_editing()) {
return UIConfiguration::instance().color_mod ("selected region base", mod_name); return UIConfiguration::instance().color_mod ("selected region base", mod_name);
} }
}
if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) &&
!UIConfiguration::instance().get_color_regions_using_track_color()) { !UIConfiguration::instance().get_color_regions_using_track_color()) {
return UIConfiguration::instance().color_mod ("midi frame base", mod_name); return UIConfiguration::instance().color_mod ("midi frame base", mod_name);