diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-08-13 20:19:39 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-08-13 20:19:39 +0000 |
| commit | 07a58ffd62f834780eb5dada7c1713e31c2e425a (patch) | |
| tree | 64b6bcd0ea1f9249af3a6656770764bc4933d726 /gtk2_ardour/port_matrix_column_labels.cc | |
| parent | f75bbfd8ac52ea33692c3ee15953ceb2994117ab (diff) | |
Stop bundles disappearing from the port matrix when they
have no channels (#4209). Also fix the remove all
channels menu option.
git-svn-id: svn://localhost/ardour2/branches/3.0@9986 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix_column_labels.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_column_labels.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index f9b5b6aef8..eba2fffddf 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -149,7 +149,7 @@ PortMatrixColumnLabels::render (cairo_t* cr) 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; @@ -214,7 +214,7 @@ PortMatrixColumnLabels::mouseover_changed (list<PortMatrixNode> 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 +273,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; |