Fix show MIDI regions using track color.
This commit is contained in:
parent
1256a70340
commit
8d98102573
@ -3257,7 +3257,8 @@ MidiRegionView::get_fill_color() const
|
|||||||
"midi frame base");
|
"midi frame base");
|
||||||
if (_selected) {
|
if (_selected) {
|
||||||
return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
|
return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
|
||||||
} else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
|
} else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
|
||||||
|
!ARDOUR_UI::config()->get_color_regions_using_track_color()) {
|
||||||
return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
|
return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
|
||||||
}
|
}
|
||||||
return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
|
return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
|
||||||
|
@ -694,27 +694,17 @@ TimeAxisViewItem::set_name_text_color ()
|
|||||||
ArdourCanvas::Color
|
ArdourCanvas::Color
|
||||||
TimeAxisViewItem::get_fill_color () const
|
TimeAxisViewItem::get_fill_color () const
|
||||||
{
|
{
|
||||||
ArdourCanvas::Color c;
|
|
||||||
const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
|
const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
|
||||||
|
|
||||||
if (_selected) {
|
if (_selected) {
|
||||||
|
return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
|
||||||
c = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
|
} else if (_recregion) {
|
||||||
|
return ARDOUR_UI::config()->color ("recording rect");
|
||||||
} else {
|
} else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
|
||||||
|
!ARDOUR_UI::config()->get_color_regions_using_track_color()) {
|
||||||
if (_recregion) {
|
return ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
|
||||||
c = ARDOUR_UI::config()->color ("recording rect");
|
|
||||||
} else {
|
|
||||||
if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
|
|
||||||
c = ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
|
|
||||||
} else {
|
|
||||||
c = ARDOUR_UI::config()->color_mod (fill_color, mod_name);
|
|
||||||
}
|
}
|
||||||
}
|
return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
|
||||||
}
|
|
||||||
|
|
||||||
return c;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user