From 7679f7802b8a0fb8881f25b51c354bc7f26af0ed Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 14 Mar 2015 22:58:40 +0100 Subject: improve port-matrix text contrast --- gtk2_ardour/port_matrix_row_labels.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 998a234bf3..8ed464954f 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -22,6 +22,8 @@ #include #include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" +#include "canvas/colors.h" +#include "utils.h" #include "port_matrix_row_labels.h" #include "port_matrix.h" #include "port_matrix_body.h" @@ -233,7 +235,9 @@ PortMatrixRowLabels::render_bundle_name ( cairo_text_extents (cr, b->name().c_str(), &ext); double const off = (grid_spacing() - ext.height) / 2; - set_source_rgb (cr, text_colour()); + Gdk::Color textcolor; + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::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()); } @@ -259,7 +263,9 @@ PortMatrixRowLabels::render_channel_name ( cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext); double const off = (grid_spacing() - ext.height) / 2; - set_source_rgb (cr, text_colour()); + Gdk::Color textcolor; + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::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