From 601c317d70a03190257577bd867cefc2c70d3275 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jul 2017 18:34:35 +0200 Subject: Clean up library inheritance (colors.h, utils.h) make libwidget independent of libcanvas. Confine basics to pbd and gtkmm2ext. --- gtk2_ardour/port_matrix_row_labels.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/port_matrix_row_labels.cc') diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index c6b02eb488..ff7ac6a48a 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -22,7 +22,7 @@ #include #include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #include "utils.h" #include "port_matrix_row_labels.h" #include "port_matrix.h" @@ -236,7 +236,7 @@ PortMatrixRowLabels::render_bundle_name ( double const off = (grid_spacing() - ext.height) / 2; Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off); cairo_show_text (cr, b->name().c_str()); @@ -264,7 +264,7 @@ PortMatrixRowLabels::render_channel_name ( double const off = (grid_spacing() - ext.height) / 2; Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); cairo_move_to (cr, port_name_x() + xoff + name_pad(), yoff + name_pad() + off); cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str()); -- cgit v1.2.3