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/editor_group_tabs.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/editor_group_tabs.cc')
-rw-r--r-- | gtk2_ardour/editor_group_tabs.cc | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc index d02181c9b6..f53326636e 100644 --- a/gtk2_ardour/editor_group_tabs.cc +++ b/gtk2_ardour/editor_group_tabs.cc @@ -20,12 +20,17 @@ #include "gtkmm2ext/utils.h" #include "ardour/route_group.h" -#include "editor_group_tabs.h" + +#include "canvas/utils.h" + #include "editor.h" -#include "route_time_axis.h" -#include "utils.h" +#include "editor_group_tabs.h" #include "editor_route_groups.h" #include "editor_routes.h" +#include "rgb_macros.h" +#include "route_time_axis.h" +#include "utils.h" + #include "i18n.h" using namespace std; @@ -83,13 +88,19 @@ void EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const { double const arc_radius = get_width(); - + double r, g, b, a; + if (tab.group && tab.group->is_active()) { - cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1); + ArdourCanvas::color_to_rgba (tab.color, r, g, b, a); } else { - cairo_set_source_rgba (cr, 1, 1, 1, 0.2); + r = 0.0; + g = 0.0; + b = 0.0; } + a = 1.0; + + cairo_set_source_rgba (cr, r, g, b, a); cairo_move_to (cr, 0, tab.from + arc_radius); cairo_arc (cr, get_width(), tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2); cairo_line_to (cr, get_width(), tab.to); @@ -103,7 +114,10 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const cairo_text_extents_t ext; cairo_text_extents (cr, tab.group->name().c_str(), &ext); - cairo_set_source_rgb (cr, 1, 1, 1); + ArdourCanvas::Color c = contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a)); + ArdourCanvas::color_to_rgba (c, r, g, b, a); + + cairo_set_source_rgb (cr, r, g, b); cairo_move_to (cr, get_width() - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2); cairo_save (cr); cairo_rotate (cr, - M_PI / 2); |