X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=1f5a21feec22daa38a9cef20161ce1340ca1522d;hb=01e0f512232fe73c18339f368c90f581a5bebdb2;hp=99dc369f0a76625b06436911d87b5bbd92e89270;hpb=19e97d1d64e8aa6d87d79d1f6332065992e5e027;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 99dc369f0a..1f5a21feec 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -18,8 +18,8 @@
 */
 
 #include <iostream>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
@@ -156,10 +156,12 @@ PortMatrixColumnLabels::render (cairo_t* cr)
 
 			for (uint32_t j = 0; j < C; ++j) {
 				Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N);
+
 				ARDOUR::BundleChannel bc (
 					(*i)->bundle,
 					(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
 					);
+				
 				render_channel_name (cr, background_colour (), c, x, 0, bc);
 				x += grid_spacing();
 			}
@@ -449,7 +451,7 @@ PortMatrixColumnLabels::position_to_channel (double p, double o, boost::shared_p
 }
 
 void
-PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixColumnLabels::button_press (double x, double y, GdkEventButton* ev)
 {
 	ARDOUR::BundleChannel w = position_to_channel (x, y, _matrix->visible_columns());
 
@@ -461,11 +463,13 @@ PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, gui
 		w.channel = -1;
 	}
 
-	if (b == 3) {
+	if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) {
+		_matrix->remove_channel (w);
+	} else if (ev->button == 3) {
 		_matrix->popup_menu (
 			w,
 			ARDOUR::BundleChannel (),
-			t
+			ev->time
 			);
 	}
 }