X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=4cf12b58b3fce1c89f4d7fc3ccc6ca1825c467ee;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=adef4c6eb755a54baecbee3d9493211e6226ccf8;hpb=50437bff22279473cd364d007d5e474af2a542bc;p=ardour.git diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index adef4c6eb7..4cf12b58b3 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_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 @@ -18,12 +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 "pbd/i18n.h" using namespace std; @@ -37,69 +40,62 @@ 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; /* width of the longest channel name */ _longest_channel_name = 0; - /* height of highest bit of text (apart from group names) */ - _highest_text = 0; - /* width of the whole thing */ - _width = 0; - PortGroup::BundleList const c = _matrix->columns()->bundles(); - for (PortGroup::BundleList::const_iterator i = c.begin (); i != c.end(); ++i) { + /* Compute dimensions using all port groups, so that we allow for the largest and hence + we can change between visible groups without the size of the labels jumping around. + */ - cairo_text_extents_t ext; - cairo_text_extents (cr, i->bundle->name().c_str(), &ext); - if (ext.width > _longest_bundle_name) { - _longest_bundle_name = ext.width; - } - if (ext.height > _highest_text) { - _highest_text = ext.height; - } + for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { + PortGroup::BundleList const c = _matrix->columns()->bundles(); + for (PortGroup::BundleList::const_iterator j = c.begin (); j != c.end(); ++j) { - for (uint32_t j = 0; j < i->bundle->nchannels (); ++j) { - - cairo_text_extents ( - cr, - i->bundle->channel_name (j).c_str(), - &ext - ); - - if (ext.width > _longest_channel_name) { - _longest_channel_name = ext.width; - } - if (ext.height > _highest_text) { - _highest_text = ext.height; + cairo_text_extents_t ext; + cairo_text_extents (cr, (*j)->bundle->name().c_str(), &ext); + if (ext.width > _longest_bundle_name) { + _longest_bundle_name = ext.width; } - } - if (_matrix->show_only_bundles()) { - _width += column_width(); - } else { - _width += i->bundle->nchannels() * column_width(); - } - } + for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) { - _highest_group_name = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - if ((*i)->visible()) { - cairo_text_extents_t ext; - cairo_text_extents (cr, (*i)->name.c_str(), &ext); - if (ext.height > _highest_group_name) { - _highest_group_name = ext.height; + if (!_matrix->should_show ((*j)->bundle->channel_type(k))) { + continue; + } + + cairo_text_extents ( + cr, + (*j)->bundle->channel_name (k).c_str(), + &ext + ); + + if (ext.width > _longest_channel_name) { + _longest_channel_name = ext.width; + } } - } else { - _width += column_width (); } } + /* height metrics */ + cairo_text_extents_t ext; + cairo_text_extents (cr, X_("AQRjpy"), &ext); + _text_height = ext.height; + _descender_height = ext.height + ext.y_bearing; + + /* width of the whole thing */ + if (_matrix->visible_columns()) { + _width = group_size (_matrix->visible_columns()) * grid_spacing (); + } else { + _width = 0; + } + cairo_destroy (cr); - gdk_pixmap_unref (pm); + cairo_surface_destroy (surface); /* height of the whole thing */ @@ -108,19 +104,16 @@ PortMatrixColumnLabels::compute_dimensions () a += _longest_channel_name; } - double const parallelogram_height = a * sin (angle()) + _highest_text * cos (angle()); - - _height = parallelogram_height + _highest_group_name + 2 * name_pad(); - - _overhang = parallelogram_height / tan (angle ()); + _height = a * sin (angle()) + _text_height * cos (angle()); + _overhang = _height / tan (angle ()); _width += _overhang; } double -PortMatrixColumnLabels::basic_text_x_pos (int c) const +PortMatrixColumnLabels::basic_text_x_pos (int) const { - return column_width() / 2 + - _highest_text / (2 * sin (angle ())); + return grid_spacing() / 2 + + _text_height / (2 * sin (angle ())); } void @@ -132,115 +125,53 @@ PortMatrixColumnLabels::render (cairo_t* cr) cairo_rectangle (cr, 0, 0, _width, _height); cairo_fill (cr); - /* PORT GROUP NAME */ - - double x = 0; - double y = 0; - - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - x = slanted_height() / tan (angle()); - y = _highest_group_name + name_pad(); - } else { - x = 0; - y = _height - name_pad(); - } - - int g = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - - /* compute width of this group */ - uint32_t w = 0; - if (!(*i)->visible() || (*i)->bundles().empty()) { - w = column_width (); - } else { - if (_matrix->show_only_bundles()) { - w = (*i)->bundles().size() * column_width(); - } else { - w = (*i)->total_channels() * column_width(); - } - } - - /* rectangle */ - set_source_rgb (cr, get_a_group_colour (g)); - double const rh = _highest_group_name + 2 * name_pad(); - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - cairo_rectangle (cr, x, 0, w, rh); - } else { - cairo_rectangle (cr, x, _height - rh, w, rh); - } - cairo_fill (cr); - - string const upper = Glib::ustring ((*i)->name).uppercase (); - pair const display = fit_to_pixels (cr, upper, w); - - /* plot it */ - set_source_rgb (cr, text_colour()); - cairo_move_to (cr, x + (w - display.second) / 2, y); - cairo_show_text (cr, display.first.c_str()); - - x += w; - ++g; - - } - /* BUNDLE PARALLELOGRAM-TYPE-THING AND NAME */ - x = 0; + double x = 0; int N = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { + PortGroup::BundleList const & bundles = _matrix->visible_columns()->bundles (); + for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { - if ((*i)->visible ()) { - - PortGroup::BundleList const & bundles = (*i)->bundles (); - for (PortGroup::BundleList::const_iterator j = bundles.begin (); j != bundles.end(); ++j) { - - Gdk::Color c = j->has_colour ? j->colour : get_a_bundle_colour (N); - render_bundle_name (cr, c, x, 0, j->bundle); - - if (_matrix->show_only_bundles()) { - x += column_width(); - } else { - x += j->bundle->nchannels () * column_width(); - } - - ++N; - } + 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 += column_width (); - + x += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing(); } + + ++N; } - /* PORT NAMES */ if (!_matrix->show_only_bundles()) { x = 0; N = 0; - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { - - if ((*i)->visible ()) { - - PortGroup::BundleList const & bundles = (*i)->bundles (); - for (PortGroup::BundleList::const_iterator j = bundles.begin (); j != bundles.end(); ++j) { - - for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) { - Gdk::Color c = j->has_colour ? j->colour : get_a_bundle_colour (N); - render_channel_name (cr, c, x, 0, ARDOUR::BundleChannel (j->bundle, k)); - x += column_width(); - } - - ++N; - } - } else { + for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) { - x += column_width (); + 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); + + 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; } } } @@ -260,21 +191,31 @@ PortMatrixColumnLabels::parent_to_component_x (double x) const double PortMatrixColumnLabels::component_to_parent_y (double y) const { + /* Column labels don't scroll vertically, so y conversion does not depend on yoffset */ return y + _parent_rectangle.get_y(); } double PortMatrixColumnLabels::parent_to_component_y (double y) const { + /* Column labels don't scroll vertically, so y conversion does not depend on yoffset */ return y - _parent_rectangle.get_y(); } void -PortMatrixColumnLabels::mouseover_changed (PortMatrixNode const &) +PortMatrixColumnLabels::mouseover_changed (list const &) { - clear_channel_highlights (); - if (_body->mouseover().column.bundle) { - add_channel_highlight (_body->mouseover().column); + list const m = _body->mouseover (); + for (list::const_iterator i = m.begin(); i != m.end(); ++i) { + + ARDOUR::BundleChannel c = i->column; + ARDOUR::BundleChannel r = i->row; + + 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); + } } } @@ -282,13 +223,13 @@ vector > PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const { vector > shape; - + double const lc = _longest_channel_name + name_pad(); - double const w = column_width(); - + double const w = grid_spacing(); + if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - double x_ = xoff + slanted_height() / tan (angle()) + w; + double x_ = xoff + _height / tan (angle()) + w; double y_ = yoff; shape.push_back (make_pair (x_, y_)); x_ -= w; @@ -299,9 +240,9 @@ PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const x_ += w * pow (sin (angle()), 2); y_ += w * sin (angle()) * cos (angle()); shape.push_back (make_pair (x_, y_)); - + } else { - + double x_ = xoff; double y_ = yoff + _height; shape.push_back (make_pair (x_, y_)); @@ -310,8 +251,8 @@ PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const x_ += lc * cos (angle()); y_ -= lc * sin (angle()); shape.push_back (make_pair (x_, y_)); - x_ -= column_width() * pow (sin (angle()), 2); - y_ -= column_width() * sin (angle()) * cos (angle()); + x_ -= grid_spacing() * pow (sin (angle()), 2); + y_ -= grid_spacing() * sin (angle()) * cos (angle()); shape.push_back (make_pair (x_, y_)); } @@ -320,44 +261,44 @@ PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const void PortMatrixColumnLabels::render_bundle_name ( - cairo_t* cr, Gdk::Color colour, double xoff, double yoff, boost::shared_ptr b + cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, boost::shared_ptr b ) { - set_source_rgb (cr, colour); + set_source_rgb (cr, bg_colour); double w = 0; if (_matrix->show_only_bundles()) { - w = column_width (); + w = grid_spacing (); } else { - w = b->nchannels() * column_width(); + w = _matrix->count_of_our_type_min_1 (b->nchannels()) * grid_spacing(); } - + double x_ = xoff; uint32_t y = yoff; - if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { - y += _height; - } else { - y += slanted_height(); - } + y += _height; double y_ = y; cairo_move_to (cr, x_, y_); x_ += w; cairo_line_to (cr, x_, y_); - x_ += slanted_height() / tan (angle ()); - y_ -= slanted_height(); + x_ += _height / tan (angle ()); + y_ -= _height; cairo_line_to (cr, x_, y_); x_ -= w; cairo_line_to (cr, x_, y_); cairo_line_to (cr, xoff, y); cairo_fill_preserve (cr); - set_source_rgb (cr, background_colour()); + set_source_rgb (cr, fg_colour); 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; + if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { double rl = 0; @@ -368,19 +309,19 @@ PortMatrixColumnLabels::render_bundle_name ( } cairo_move_to ( cr, - xoff + basic_text_x_pos (0) + rl * cos (angle()), - yoff + _height - rl * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()) + rl * cos (angle()), + yoff + _height - q * cos (angle ()) - rl * sin (angle()) ); - + } else { - + cairo_move_to ( cr, - xoff + basic_text_x_pos (0), - yoff + slanted_height() - name_pad() * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()), + yoff + _height - q * cos (angle ()) ); } - + cairo_save (cr); cairo_rotate (cr, -angle()); cairo_show_text (cr, b->name().c_str()); @@ -389,7 +330,7 @@ PortMatrixColumnLabels::render_bundle_name ( void PortMatrixColumnLabels::render_channel_name ( - cairo_t* cr, Gdk::Color colour, double xoff, double yoff, ARDOUR::BundleChannel const &bc + cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, ARDOUR::BundleChannel const &bc ) { vector > const shape = port_name_shape (xoff, yoff); @@ -399,69 +340,63 @@ PortMatrixColumnLabels::render_channel_name ( cairo_line_to (cr, shape[i].first, shape[i].second); } cairo_line_to (cr, shape[0].first, shape[0].second); - - set_source_rgb (cr, colour); + + set_source_rgb (cr, bg_colour); cairo_fill_preserve (cr); - set_source_rgb (cr, background_colour()); + set_source_rgb (cr, fg_colour); 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; + if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { cairo_move_to ( cr, - xoff + basic_text_x_pos(bc.channel), - yoff + _height - name_pad() * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()), + yoff + _height - q * cos (angle ()) ); - - } else { + + + } else { double const rl = 3 * name_pad() + _longest_bundle_name; cairo_move_to ( cr, - xoff + basic_text_x_pos(bc.channel) + rl * cos (angle ()), - yoff + slanted_height() - rl * sin (angle()) + xoff + grid_spacing() - q * sin (angle ()) + rl * cos (angle ()), + yoff + _height - q * cos (angle ()) - rl * sin (angle()) ); } - - cairo_save (cr); - cairo_rotate (cr, -angle()); - - cairo_show_text ( - cr, - bc.bundle->channel_name(bc.channel).c_str() - ); - - cairo_restore (cr); -} -double -PortMatrixColumnLabels::channel_x (ARDOUR::BundleChannel const &bc) const -{ - uint32_t n = 0; + if (_matrix->count_of_our_type (bc.bundle->nchannels()) > 1) { - PortGroup::BundleList const & b = _matrix->columns()->bundles (); - PortGroup::BundleList::const_iterator i = b.begin(); - while (i != b.end() && i->bundle != bc.bundle) { - if (_matrix->show_only_bundles()) { - n += 1; - } else { - n += i->bundle->nchannels (); - } - ++i; - } + /* only plot the name if the bundle has more than one channel; + the name of a single channel is assumed to be redundant */ - if (!_matrix->show_only_bundles()) { - n += bc.channel; + cairo_save (cr); + cairo_rotate (cr, -angle()); + + cairo_show_text ( + cr, + bc.bundle->channel_name(bc.channel).c_str() + ); + + cairo_restore (cr); } +} - return n * column_width(); +double +PortMatrixColumnLabels::channel_x (ARDOUR::BundleChannel const &bc) const +{ + return channel_to_position (bc, _matrix->visible_columns()) * grid_spacing (); } double -PortMatrixColumnLabels::channel_y (ARDOUR::BundleChannel const &bc) const +PortMatrixColumnLabels::channel_y (ARDOUR::BundleChannel const &) const { return 0; } @@ -476,139 +411,108 @@ PortMatrixColumnLabels::queue_draw_for (ARDOUR::BundleChannel const & bc) if (_matrix->show_only_bundles()) { _body->queue_draw_area ( - component_to_parent_x (channel_x (bc)), - component_to_parent_y (0), - column_width() + _height * tan (angle()), - _height + component_to_parent_x (channel_x (bc)) - 1, + component_to_parent_y (0) - 1, + grid_spacing() + _height * tan (angle()) + 2, + _height + 2 ); - + } else { - + double const x = channel_x (bc); double const lc = _longest_channel_name + name_pad(); - double const h = lc * sin (angle ()) + column_width() * sin (angle()) * cos (angle()); - + double const h = lc * sin (angle ()) + grid_spacing() * sin (angle()) * cos (angle()); + if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) { _body->queue_draw_area ( - component_to_parent_x (x), - component_to_parent_y (_height - h), - column_width() + lc * cos (angle()), - h + component_to_parent_x (x) - 1, + component_to_parent_y (_height - h) - 1, + grid_spacing() + lc * cos (angle()) + 2, + h + 2 ); - + } else if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - - double const x_ = x + slanted_height() / tan (angle()) - lc * cos (angle()); - + + double const x_ = x + _height / tan (angle()) - lc * cos (angle()); + _body->queue_draw_area ( - component_to_parent_x (x_), - component_to_parent_y (0), - column_width() + lc * cos (angle()), - h + component_to_parent_x (x_) - 1, + component_to_parent_y (0) - 1, + grid_spacing() + lc * cos (angle()) + 2, + h + 2 ); - + } - + } } -pair, ARDOUR::BundleChannel> -PortMatrixColumnLabels::x_position_to_group_and_channel (double x, double y) const +ARDOUR::BundleChannel +PortMatrixColumnLabels::position_to_channel (double p, double o, boost::shared_ptr group) const { - uint32_t cx = 0; - uint32_t const gh = _highest_group_name + 2 * name_pad(); + uint32_t const cx = p - (_height - o) * tan (angle ()); + return PortMatrixComponent::position_to_channel (cx, o, group); +} - bool group_name = false; - if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { - if (y > (_height - gh)) { - group_name = true; - cx = x; - } else { - cx = x - (_height - gh - y) * tan (angle ()); - } - } else { - if (y < gh) { - group_name = true; - cx = x - _overhang; - } else { - cx = x - (_height - y) * tan (angle ()); - } +void +PortMatrixColumnLabels::button_press (double x, double y, GdkEventButton* ev) +{ + ARDOUR::BundleChannel w = position_to_channel (x, y, _matrix->visible_columns()); + + if ( + (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && y > (_height - _longest_bundle_name * sin (angle ()))) || + (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && y < (_longest_bundle_name * sin (angle ()))) + ) { + + w.channel = -1; } - uint32_t px = 0; + 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 (), + ev->time + ); + } +} - pair, ARDOUR::BundleChannel> gc; - - for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) { +void +PortMatrixColumnLabels::motion (double x, double y) +{ + ARDOUR::BundleChannel const w = position_to_channel (x, y, _matrix->visible_columns()); - if (!(*i)->visible()) { + if (w.bundle == 0) { + _body->set_mouseover (PortMatrixNode ()); + return; + } - uint32_t const gw = group_width (*i); - - if (px <= cx && cx < (px + gw)) { - return make_pair (*i, ARDOUR::BundleChannel ()); - } else { - px += gw; - } + uint32_t const bh = _longest_channel_name * sin (angle ()) + _text_height / cos (angle ()); - } else { - - PortGroup::BundleList bundles = (*i)->bundles (); - for (PortGroup::BundleList::iterator j = bundles.begin(); j != bundles.end(); ++j) { - - if (_matrix->show_only_bundles()) { - - if (px <= cx && cx < (px + column_width())) { - return make_pair (*i, ARDOUR::BundleChannel (j->bundle, 0)); - } else { - px += column_width (); - } - - } else { - - for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) { - - if (px <= cx && cx < (px + column_width())) { - if (group_name) { - return make_pair (*i, ARDOUR::BundleChannel ()); - } else { - return make_pair (*i, ARDOUR::BundleChannel (j->bundle, k)); - } - } - - px += column_width (); - } - } + if ( + (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && y > bh) || + (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && y < (_height - bh)) + ) { + + /* if the mouse is over a bundle name, highlight all channels in the bundle */ + + list n; + for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) { + if (!_matrix->should_show (w.bundle->channel_type (i))) { + continue; } + + ARDOUR::BundleChannel const bc (w.bundle, i); + n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc)); } - - } - return make_pair (boost::shared_ptr (), ARDOUR::BundleChannel ()); -} + _body->set_mouseover (n); -void -PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t) -{ - pair, ARDOUR::BundleChannel> gc = x_position_to_group_and_channel (x, y); - - if (b == 1) { - - if (gc.second.bundle) { - _body->highlight_associated_channels (_matrix->column_index(), gc.second); - } else if (gc.first) { - gc.first->set_visible (!gc.first->visible ()); - } - - } else if (b == 3) { + } else { - _matrix->popup_menu ( - gc, - make_pair (boost::shared_ptr (), ARDOUR::BundleChannel ()), - t - ); + _body->set_mouseover (PortMatrixNode (ARDOUR::BundleChannel (), w)); } } -