diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-02-09 03:18:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-02-09 03:18:10 +0000 |
| commit | ee42a6dd97045253d1a9bb32fc2e571d235f9967 (patch) | |
| tree | 1d4994d28477b659474075fdf82f7dbc9069bf7d /gtk2_ardour/port_matrix_row_labels.cc | |
| parent | 91032b311ee44d7bcca65feb06aca077cc3671b5 (diff) | |
Fixes to bundle manager to make it vaguely usable.
Rework signal handling for bundles so that all changes should now be noticed by port matrices.
git-svn-id: svn://localhost/ardour2/branches/3.0@4501 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix_row_labels.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_row_labels.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index 8d5b31693b..98b185591d 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -104,16 +104,12 @@ PortMatrixRowLabels::render (cairo_t* cr) int g = 0; for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) { - if (!(*i)->visible() || ((*i)->bundles().empty() && (*i)->ports.empty()) ) { + if (!(*i)->visible() || (*i)->bundles().empty()) { continue; } /* compute height of this group */ - double h = 0; - for (ARDOUR::BundleList::const_iterator j = (*i)->bundles().begin(); j != (*i)->bundles().end(); ++j) { - h += (*j)->nchannels() * row_height(); - } - h += (*i)->ports.size() * row_height(); + double h = (*i)->total_channels () * row_height(); /* rectangle */ set_source_rgb (cr, get_a_group_colour (g)); @@ -202,11 +198,6 @@ PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t) void PortMatrixRowLabels::maybe_popup_context_menu (double x, double y, uint32_t t) { - if (!_matrix->can_rename_channels (_matrix->row_index()) && - !_matrix->can_remove_channels (_matrix->row_index())) { - return; - } - if ( (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x > (_longest_bundle_name + name_pad() * 2)) || (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x < (_longest_port_name + name_pad() * 2)) ) { |