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/port_matrix_column_labels.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/port_matrix_column_labels.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_column_labels.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 4cf12b58b3..372e6fe7c5 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -20,7 +20,7 @@ #include <iostream> #include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #include "utils.h" #include "port_matrix_column_labels.h" #include "port_matrix.h" @@ -294,7 +294,7 @@ PortMatrixColumnLabels::render_bundle_name ( cairo_stroke (cr); 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); double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; @@ -348,7 +348,7 @@ PortMatrixColumnLabels::render_channel_name ( cairo_stroke (cr); 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); double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; |