ardour/livetrax
13
0
Fork 0
Code

Fix show MIDI regions using track color.

Browse Source
This commit is contained in:
David Robillard 2015-01-08 19:59:40 -05:00
parent 1256a70340
commit 8d98102573
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/midi_region_view.cc
View File

@ -3257,7 +3257,8 @@ MidiRegionView::get_fill_color() const
"midi frame base");
if (_selected) {
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 (fill_color, mod_name);

24
gtk2_ardour/time_axis_view_item.cc
View File

@ -694,27 +694,17 @@ TimeAxisViewItem::set_name_text_color ()
ArdourCanvas::Color
TimeAxisViewItem::get_fill_color () const
{
ArdourCanvas::Color c;
const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
if (_selected) {
c = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
} else {
if (_recregion) {
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 ("selected region base", mod_name);
} else if (_recregion) {
return 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()) {
return ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
}
return c;
return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
}
/**