X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_row_labels.cc;h=c6b02eb488cc3ca85e298dc7baf070034172d61b;hb=6a4fb5838463b4b2803b999b0df0ec5b0d9e399f;hp=e7f1153e90cc9e9cb9545487925058f6bce9e086;hpb=668c8b1f9e1df57e749e93953918832a38b17e23;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index e7f1153e90..c6b02eb488 100644
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -19,14 +19,15 @@
 
 #include <iostream>
 #include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #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"
-#include "i18n.h"
-#include "utils.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -122,7 +123,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
 					(*i)->bundle,
 					(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
 					);
-				
+
 				render_channel_name (cr, background_colour (), c, 0, y, bc);
 				y += grid_spacing();
 				++M;
@@ -131,7 +132,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
 			if (N == 0) {
 				y += grid_spacing ();
 			}
-			
+
 		} else {
 			y += grid_spacing();
 		}
@@ -234,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());
 }
@@ -260,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());
 	}