X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=372e6fe7c5e8de78da36167fba923d550365df34;hb=b06713bd8e57a33bdb4544a3de249933e984f1be;hp=091eb0f9daf0375972345d84f8a8cb34a5494050;hpb=16884aff2a2c03f613ded8088defbc1c4d546576;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 091eb0f9da..372e6fe7c5 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -18,14 +18,15 @@
 */
 
 #include <iostream>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
-#include "ardour/types.h"
+#include "gtkmm2ext/colors.h"
+#include "utils.h"
 #include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
-#include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -39,9 +40,8 @@ PortMatrixColumnLabels::PortMatrixColumnLabels (PortMatrix* m, PortMatrixBody* b
 void
 PortMatrixColumnLabels::compute_dimensions ()
 {
-	GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, gdk_visual_get_depth (gdk_visual_get_system ()));
-	gdk_drawable_set_colormap (pm, gdk_colormap_get_system());
-	cairo_t* cr = gdk_cairo_create (pm);
+	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 200, 200);
+	cairo_t* cr = cairo_create (surface);
 
 	/* width of the longest bundle name */
 	_longest_bundle_name = 0;
@@ -95,7 +95,7 @@ PortMatrixColumnLabels::compute_dimensions ()
 	}
 
 	cairo_destroy (cr);
-	g_object_unref (pm);
+	cairo_surface_destroy (surface);
 
 	/* height of the whole thing */
 
@@ -157,7 +157,13 @@ 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);
-				render_channel_name (cr, background_colour (), c, x, 0, ARDOUR::BundleChannel ((*i)->bundle, j));
+
+				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();
 			}
 
@@ -287,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, Gtkmm2ext::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;
 
@@ -339,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, Gtkmm2ext::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;
 
@@ -446,7 +456,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());
 
@@ -458,11 +468,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
 			);
 	}
 }
@@ -488,9 +500,11 @@ PortMatrixColumnLabels::motion (double x, double y)
 
 		list<PortMatrixNode> n;
 
-		uint32_t const N = _matrix->count_of_our_type (w.bundle->nchannels ());
+		for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
+			if (!_matrix->should_show (w.bundle->channel_type (i))) {
+				continue;
+			}
 
-		for (uint32_t i = 0; i < N; ++i) {
 			ARDOUR::BundleChannel const bc (w.bundle, i);
 			n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
 		}