diff options
| author | Robin Gareus <robin@gareus.org> | 2017-07-17 18:34:35 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
| commit | 601c317d70a03190257577bd867cefc2c70d3275 (patch) | |
| tree | 077071290f084431a912414c4e87b6127c586677 /gtk2_ardour/mixer_group_tabs.cc | |
| parent | 1f5ebc54853446a786925941bd014666e75221d2 (diff) | |
Clean up library inheritance (colors.h, utils.h)
make libwidget independent of libcanvas.
Confine basics to pbd and gtkmm2ext.
Diffstat (limited to 'gtk2_ardour/mixer_group_tabs.cc')
| -rw-r--r-- | gtk2_ardour/mixer_group_tabs.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index c26a553905..8b5907c7d8 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -23,7 +23,7 @@ #include "ardour/route_group.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #include "mixer_group_tabs.h" #include "mixer_strip.h" @@ -113,9 +113,9 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) double r, g, b, a; if (tab.group && tab.group->is_active()) { - ArdourCanvas::color_to_rgba (tab.color, r, g, b, a); + Gtkmm2ext::color_to_rgba (tab.color, r, g, b, a); } else { - ArdourCanvas::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a); + Gtkmm2ext::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a); } a = 1.0; @@ -140,8 +140,8 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) cairo_move_to (cr, tab.from + (tab.to - tab.from - text_width) * .5, (get_height () - text_height) * .5); - ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a)); - ArdourCanvas::color_to_rgba (c, r, g, b, a); + Gtkmm2ext::Color c = Gtkmm2ext::contrasting_text_color (Gtkmm2ext::rgba_to_color (r, g, b, a)); + Gtkmm2ext::color_to_rgba (c, r, g, b, a); cairo_set_source_rgb (cr, r, g, b); pango_cairo_show_layout (cr, layout->gobj ()); |