X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=4cf12b58b3fce1c89f4d7fc3ccc6ca1825c467ee;hb=d26c3d380d8fdd7b9cfef6e8e21aa8ad641b978e;hp=f9b5b6aef8101df16011a28e8497e62a749988f3;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index f9b5b6aef8..4cf12b58b3 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -18,14 +18,15 @@ */ #include +#include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" -#include "ardour/types.h" +#include "canvas/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, 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); /* 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 */ @@ -133,23 +133,13 @@ PortMatrixColumnLabels::render (cairo_t* cr) PortGroup::BundleList const & bundles = _matrix->visible_columns()->bundles (); for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { - bool should_show_this_bundle = false; - for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) { - if (_matrix->should_show ((*i)->bundle->channel_type (j))) { - should_show_this_bundle = true; - break; - } - } - - if (should_show_this_bundle) { - Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N); - render_bundle_name (cr, background_colour (), c, x, 0, (*i)->bundle); - } + Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N); + render_bundle_name (cr, background_colour (), c, x, 0, (*i)->bundle); if (_matrix->show_only_bundles()) { x += grid_spacing(); } else { - x += _matrix->count_of_our_type ((*i)->bundle->nchannels()) * grid_spacing(); + x += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing(); } ++N; @@ -163,17 +153,24 @@ PortMatrixColumnLabels::render (cairo_t* cr) for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { - for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) { - - if (!_matrix->should_show ((*i)->bundle->channel_type(j))) { - continue; - } + uint32_t const C = _matrix->count_of_our_type ((*i)->bundle->nchannels ()); + 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(); } + if (C == 0) { + x += grid_spacing (); + } + ++N; } } @@ -214,7 +211,7 @@ PortMatrixColumnLabels::mouseover_changed (list const &) ARDOUR::BundleChannel c = i->column; ARDOUR::BundleChannel r = i->row; - if (c.bundle && r.bundle) { + if (PortMatrix::bundle_with_channels (c.bundle) && PortMatrix::bundle_with_channels (r.bundle)) { add_channel_highlight (c); } else if (c.bundle) { _body->highlight_associated_channels (_matrix->column_index(), c); @@ -273,7 +270,7 @@ PortMatrixColumnLabels::render_bundle_name ( if (_matrix->show_only_bundles()) { w = grid_spacing (); } else { - w = _matrix->count_of_our_type (b->nchannels()) * grid_spacing(); + w = _matrix->count_of_our_type_min_1 (b->nchannels()) * grid_spacing(); } double x_ = xoff; @@ -296,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; @@ -348,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; @@ -455,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()); @@ -467,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 ); } } @@ -498,8 +501,7 @@ PortMatrixColumnLabels::motion (double x, double y) list 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; }