diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:28:32 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:29:00 -0400 |
commit | ce08ec0de0b0b077d9b28533c23886607991d144 (patch) | |
tree | 031a01c89075fbf90733da202ce8b19f6f048a6c /gtk2_ardour/streamview.cc | |
parent | 438179d278559bcb41a8abdadfb5e6b2e1e89d2d (diff) |
substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
Group tabs now also get the text drawn in an appropriately contrast-y color
Diffstat (limited to 'gtk2_ardour/streamview.cc')
-rw-r--r-- | gtk2_ardour/streamview.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 404b934562..97e3d3aa79 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -343,7 +343,13 @@ StreamView::diskstream_changed () } void -StreamView::apply_color (Gdk::Color color, ColorTarget target) +StreamView::apply_color (Gdk::Color const& c, ColorTarget target) +{ + return apply_color (gdk_color_to_rgba (c), target); +} + +void +StreamView::apply_color (uint32_t color, ColorTarget target) { list<RegionView *>::iterator i; @@ -356,7 +362,7 @@ StreamView::apply_color (Gdk::Color color, ColorTarget target) break; case StreamBaseColor: - stream_base_color = RGBA_TO_UINT (color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255); + stream_base_color = color; canvas_rect->set_fill_color (stream_base_color); break; } |