From e587155ee56a8dc81185f055abc7126642d946b6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Jul 2009 20:42:14 +0000 Subject: Use the word `port' rather than `channel' when adding channels to a route's bundle. Don't mouseover on hidden groups in the matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5385 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_matrix_grid.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/port_matrix_grid.cc') diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc index 8055a11c56..50740cae63 100644 --- a/gtk2_ardour/port_matrix_grid.cc +++ b/gtk2_ardour/port_matrix_grid.cc @@ -441,8 +441,8 @@ PortMatrixGrid::draw_extra (cairo_t* cr) double const x = component_to_parent_x (channel_to_position (_body->mouseover().column, _matrix->columns()) * grid_spacing()) + grid_spacing() / 2; double const y = component_to_parent_y (channel_to_position (_body->mouseover().row, _matrix->rows()) * grid_spacing()) + grid_spacing() / 2; - - if (_body->mouseover().row.bundle) { + + if (_body->mouseover().row.bundle && _body->mouseover().column.bundle) { cairo_move_to (cr, x, y); if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { @@ -451,9 +451,6 @@ PortMatrixGrid::draw_extra (cairo_t* cr) cairo_line_to (cr, _parent_rectangle.get_x() + _parent_rectangle.get_width(), y); } cairo_stroke (cr); - } - - if (_body->mouseover().column.bundle) { cairo_move_to (cr, x, y); if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) { -- cgit v1.2.3