Another engine dialog edge-case fix to set the samplerate

[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 8c8dcd4dfff5ab09d6f4a0945f54e694168493de..893313c607012b4c93d295bb125269eba6800c7f 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -19,18 +19,22 @@
 
 #include <iostream>
 #include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
+#include "gtkmm2ext/colors.h"
+#include "utils.h"
 #include "port_matrix_row_labels.h"
+#include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
-#include "i18n.h"
-#include "utils.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
-PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b)
+PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b, PortMatrixColumnLabels& cols)
        : PortMatrixLabels (m, b)
+       , _column_labels (cols)
 {
 
 }
@@ -38,9 +42,8 @@ PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b)
 void
 PortMatrixRowLabels::compute_dimensions ()
 {
-       GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, 24);
-       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);
 
        _longest_port_name = 0;
        _longest_bundle_name = 0;
@@ -83,7 +86,7 @@ PortMatrixRowLabels::compute_dimensions ()
        }
 
        cairo_destroy (cr);
-       g_object_unref (pm);
+       cairo_surface_destroy (surface);
 
        _width = _longest_bundle_name +
                name_pad() * 2;
@@ -92,6 +95,13 @@ PortMatrixRowLabels::compute_dimensions ()
                _width += _longest_port_name;
                _width += name_pad() * 2;
        }
+
+       uint32_t needed_by_columns = _column_labels.dimensions().second * tan (angle());
+
+       if (_width < needed_by_columns) {
+               _longest_bundle_name += (needed_by_columns - _width);
+               _width = needed_by_columns;
+       }
 }
 
 
@@ -118,7 +128,12 @@ PortMatrixRowLabels::render (cairo_t* cr)
                        uint32_t const N = _matrix->count_of_our_type ((*i)->bundle->nchannels());
                        for (uint32_t j = 0; j < N; ++j) {
                                Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (M);
-                               render_channel_name (cr, background_colour (), c, 0, y, 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, 0, y, bc);
                                y += grid_spacing();
                                ++M;
                        }
@@ -126,7 +141,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
                        if (N == 0) {
                                y += grid_spacing ();
                        }
-                       
+
                } else {
                        y += grid_spacing();
                }
@@ -136,7 +151,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
 }
 
 void
-PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev)
 {
        ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
 
@@ -148,12 +163,13 @@ PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
                        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 (
                        ARDOUR::BundleChannel (),
                        w,
-                       t
+                       ev->time
                        );
        }
 }
@@ -228,7 +244,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, Gtkmm2ext::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());
 }
@@ -254,7 +272,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, Gtkmm2ext::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());
        }
@@ -335,8 +355,7 @@ PortMatrixRowLabels::motion (double x, double y)
                        list<PortMatrixNode> n;
 
                        for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
-
-                               if (!_matrix->should_show (w.bundle->channel_type(i))) {
+                               if (!_matrix->should_show (w.bundle->channel_type (i))) {
                                        continue;
                                }