diff options
| author | David Robillard <d@drobilla.net> | 2015-01-08 19:59:40 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-08 19:59:40 -0500 |
| commit | 8d981025739863bac9be84241d4bff009a4cea0b (patch) | |
| tree | b925b255e718b11c1cd5d3e396b7be6e0020fe58 /gtk2_ardour/time_axis_view_item.cc | |
| parent | 1256a7034008d534630b70a351571f638be69860 (diff) | |
Fix show MIDI regions using track color.
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index e6053906e0..5b6a63f279 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -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 c; + 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 ARDOUR_UI::config()->color_mod (fill_color, mod_name); } /** |