restore (mostly) processor colors from before RC meta-ization

[ardour.git] / gtk2_ardour / port_matrix_body.cc

diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc
index 73eae929b9d2eacb998c971d46d89ad550e82ac8..3d564319f841fe8b497966a7d3ac2dce96f21c4f 100644 (file)
--- a/gtk2_ardour/port_matrix_body.cc
+++ b/gtk2_ardour/port_matrix_body.cc
@@ -223,21 +223,21 @@ PortMatrixBody::compute_rectangles ()
        } else if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
 
                col_rect.set_height (min (_alloc_height, col.second));
+               row_rect.set_height (std::min (_alloc_height - col_rect.get_height(), row.second));
 
                row_rect.set_x (0);
-               row_rect.set_y (0);
+               row_rect.set_y (_alloc_height - row_rect.get_height() - col_rect.get_height());
                row_rect.set_width (min (_alloc_width, row.first));
-               row_rect.set_height (std::min (_alloc_height - col_rect.get_height(), row.second));
 
                grid_rect.set_x (row_rect.get_width());
-               grid_rect.set_y (0);
+               grid_rect.set_y (_alloc_height - row_rect.get_height() - col_rect.get_height());
                grid_rect.set_width (std::min (_alloc_width - row_rect.get_width(), grid.first));
                grid_rect.set_height (row_rect.get_height ());
 
                col_rect.set_width (grid_rect.get_width () + col_overhang);
                col_rect.set_x (row_rect.get_width() + grid_rect.get_width() - col_rect.get_width());
                _column_labels_border_x = col_rect.get_x () >= 0 ? col_rect.get_x () : 0;
-               col_rect.set_y (row_rect.get_height());
+               col_rect.set_y (_alloc_height - col_rect.get_height());
        }
 
        _column_labels_height = col_rect.get_height ();
@@ -476,9 +476,14 @@ PortMatrixBody::highlight_associated_channels (int dim, ARDOUR::BundleChannel h)
                        if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
                                continue;
                        }
-                       
+
                        bc[1 - dim] = ARDOUR::BundleChannel ((*i)->bundle, j);
-                       if (_matrix->get_state (bc) == PortMatrixNode::ASSOCIATED) {
+
+                       PortMatrixNode n;
+                       n.row = bc[_matrix->row_index()];
+                       n.column = bc[_matrix->column_index()];
+
+                       if (_matrix->get_association(n) != PortMatrixNode::NOT_ASSOCIATED) {
                                if (dim == _matrix->column_index()) {
                                        _row_labels->add_channel_highlight (bc[1 - dim]);
                                } else {