X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_labels.cc;h=e2fe306726b66240d4eeae4d61fb672f29c5a557;hb=8e59a26ccf13de93ac681d761bad09cd6bcf0c90;hp=2734a193efddfca0cffe2cbe1c56803e69bcf22c;hpb=67d545c0809522e8d32b919941f2be56d94c7ba3;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_labels.cc b/gtk2_ardour/port_matrix_labels.cc
index 2734a193ef..e2fe306726 100644
--- a/gtk2_ardour/port_matrix_labels.cc
+++ b/gtk2_ardour/port_matrix_labels.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,19 +19,31 @@
 
 #include "ardour/bundle.h"
 #include "port_matrix_labels.h"
+#include "port_matrix.h"
 
 void
 PortMatrixLabels::draw_extra (cairo_t* cr)
 {
 	for (std::vector<ARDOUR::BundleChannel>::const_iterator i = _channel_highlights.begin(); i != _channel_highlights.end(); ++i) {
-
-		render_channel_name (
-			cr,
-			highlighted_channel_colour(),
-			component_to_parent_x (channel_x (*i)),
-			component_to_parent_y (channel_y (*i)),
-			*i
-			);
+		if (_matrix->show_only_bundles()) {
+			render_bundle_name (
+				cr,
+				mouseover_line_colour(),
+				highlighted_channel_colour(),
+				component_to_parent_x (channel_x (*i)),
+				component_to_parent_y (channel_y (*i)),
+				i->bundle
+				);
+		} else {
+			render_channel_name (
+				cr,
+				mouseover_line_colour(),
+				highlighted_channel_colour(),
+				component_to_parent_x (channel_x (*i)),
+				component_to_parent_y (channel_y (*i)),
+				*i
+				);
+		}
 	}
 }
 
@@ -39,7 +51,6 @@ void
 PortMatrixLabels::clear_channel_highlights ()
 {
 	for (std::vector<ARDOUR::BundleChannel>::const_iterator i = _channel_highlights.begin(); i != _channel_highlights.end(); ++i) {
-
 		queue_draw_for (*i);
 	}