X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=4cf12b58b3fce1c89f4d7fc3ccc6ca1825c467ee;hb=822810b88fd13d1764b5f686baa8edb3e27e95fc;hp=8e18dbea7a173032874e2aeffe6d696279609904;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 8e18dbea7a..4cf12b58b3 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -20,11 +20,13 @@
 #include <iostream>
 #include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
+#include "canvas/colors.h"
+#include "utils.h"
 #include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -160,7 +162,7 @@ PortMatrixColumnLabels::render (cairo_t* cr)
 					(*i)->bundle,
 					(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
 					);
-				
+
 				render_channel_name (cr, background_colour (), c, x, 0, bc);
 				x += grid_spacing();
 			}
@@ -291,7 +293,9 @@ PortMatrixColumnLabels::render_bundle_name (
 	cairo_set_line_width (cr, label_border_width());
 	cairo_stroke (cr);
 
-	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);
 
 	double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
 
@@ -343,7 +347,9 @@ PortMatrixColumnLabels::render_channel_name (
 	cairo_set_line_width (cr, label_border_width());
 	cairo_stroke (cr);
 
-	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);
 
 	double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
 
@@ -498,7 +504,7 @@ PortMatrixColumnLabels::motion (double x, double y)
 			if (!_matrix->should_show (w.bundle->channel_type (i))) {
 				continue;
 			}
-			
+
 			ARDOUR::BundleChannel const bc (w.bundle, i);
 			n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
 		}