diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-08-30 09:48:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-08-30 09:48:53 +0000 |
| commit | 7d32cf3813b7145b98c86b59867092e04aa2621a (patch) | |
| tree | dbb2d319f55e2c287b51a7071a236dadd6d83ca3 /gtk2_ardour/mixer_group_tabs.cc | |
| parent | 9b7ae4cccc8507bc3e74e909b738a5b87a2b717b (diff) | |
Give route groups their own colour, settable from the route
group dialogue. Americanise spelling of color in a few
places to avoid confusion. Fixes #4224. Addresses parts
of #2650 and #4064.
git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_group_tabs.cc')
| -rw-r--r-- | gtk2_ardour/mixer_group_tabs.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 6c97a8f043..b74455b28d 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -67,7 +67,10 @@ MixerGroupTabs::compute_tabs () const tab.from = x; tab.group = g; - tab.colour = s->color (); + + if (g) { + tab.color = group_color (g); + } } x += s->get_width (); @@ -87,7 +90,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const double const arc_radius = _height; if (tab.group && tab.group->is_active()) { - cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1); + cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1); } else { cairo_set_source_rgba (cr, 1, 1, 1, 0.2); } |