new transparent-background versions of track/bus list icons from thorsten

[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 9878dc23dd9ba597723b01fcf4c553e2be9b36dd..bc6e2a2fa19005f50259b81b5c23270402dbb065 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -54,16 +54,21 @@ PortMatrixRowLabels::compute_dimensions ()
                PortGroup::BundleList const r = (*i)->bundles ();
                for (PortGroup::BundleList::const_iterator j = r.begin(); j != r.end(); ++j) {
 
-                       for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) {
+                       for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) {
+
+                               if (!_matrix->should_show ((*j)->bundle->channel_type(k))) {
+                                       continue;
+                               }
+
                                cairo_text_extents_t ext;
-                               cairo_text_extents (cr, j->bundle->channel_name(k).c_str(), &ext);
+                               cairo_text_extents (cr, (*j)->bundle->channel_name(k).c_str(), &ext);
                                if (ext.width > _longest_port_name) {
                                        _longest_port_name = ext.width;
                                }
                        }
 
                        cairo_text_extents_t ext;
-                       cairo_text_extents (cr, j->bundle->name().c_str(), &ext);
+                       cairo_text_extents (cr, (*j)->bundle->name().c_str(), &ext);
                        if (ext.width > _longest_bundle_name) {
                                _longest_bundle_name = ext.width;
                        }
@@ -78,7 +83,7 @@ PortMatrixRowLabels::compute_dimensions ()
        }
 
        cairo_destroy (cr);
-       gdk_pixmap_unref (pm);
+       g_object_unref (pm);
 
        _width = _longest_bundle_name +
                name_pad() * 2;
@@ -104,22 +109,27 @@ PortMatrixRowLabels::render (cairo_t* cr)
        double y = 0;
        int N = 0;
        int M = 0;
-       
+
        PortGroup::BundleList const & bundles = _matrix->visible_rows()->bundles ();
        for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
-               render_bundle_name (cr, background_colour (), i->has_colour ? i->colour : get_a_bundle_colour (N), 0, y, i->bundle);
+               render_bundle_name (cr, background_colour (), (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N), 0, y, (*i)->bundle);
 
                if (!_matrix->show_only_bundles()) {
-                       for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
-                               Gdk::Color c = i->has_colour ? i->colour : get_a_bundle_colour (M);
-                               render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel (i->bundle, j));
+                       for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
+
+                               if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
+                                       continue;
+                               }
+
+                               Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (M);
+                               render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel ((*i)->bundle, j));
                                y += grid_spacing();
                                ++M;
                        }
                } else {
                        y += grid_spacing();
                }
-               
+
                ++N;
        }
 }
@@ -127,7 +137,15 @@ PortMatrixRowLabels::render (cairo_t* cr)
 void
 PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
 {
-       ARDOUR::BundleChannel const w = position_to_channel (y, x, _matrix->visible_rows());
+       ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
+
+       if (
+               (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_longest_port_name + name_pad() * 2)) ||
+               (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < (_longest_bundle_name + name_pad() * 2))
+
+               ) {
+                       w.channel = -1;
+       }
 
        if (b == 3) {
 
@@ -197,7 +215,7 @@ PortMatrixRowLabels::render_bundle_name (
 {
        double const x = bundle_name_x ();
 
-       int const n = _matrix->show_only_bundles() ? 1 : b->nchannels();
+       int const n = _matrix->show_only_bundles() ? 1 : _matrix->count_of_our_type (b->nchannels());
        set_source_rgb (cr, bg_colour);
        cairo_rectangle (cr, xoff + x, yoff, _longest_bundle_name + name_pad() * 2, grid_spacing() * n);
        cairo_fill_preserve (cr);
@@ -230,11 +248,11 @@ PortMatrixRowLabels::render_channel_name (
        cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext);
        double const off = (grid_spacing() - ext.height) / 2;
 
-       if (bc.bundle->nchannels() > 1) {
+       if (_matrix->count_of_our_type (bc.bundle->nchannels()) > 1) {
 
                /* only plot the name if the bundle has more than one channel;
                   the name of a single channel is assumed to be redundant */
-               
+
                set_source_rgb (cr, text_colour());
                cairo_move_to (cr, port_name_x() + xoff + name_pad(), yoff + name_pad() + off);
                cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str());
@@ -282,10 +300,10 @@ PortMatrixRowLabels::mouseover_changed (list<PortMatrixNode> const &)
 {
        list<PortMatrixNode> const m = _body->mouseover ();
        for (list<PortMatrixNode>::const_iterator i = m.begin(); i != m.end(); ++i) {
-               
+
                ARDOUR::BundleChannel c = i->column;
                ARDOUR::BundleChannel r = i->row;
-               
+
                if (c.bundle && r.bundle) {
                        add_channel_highlight (r);
                } else if (r.bundle) {
@@ -304,30 +322,35 @@ PortMatrixRowLabels::motion (double x, double y)
        bool done = false;
 
        if (w.bundle) {
-               
+
                if (
                        (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < bw) ||
                        (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_width - bw) && x < _width)
-                       
+
                        ) {
 
                        /* if the mouse is over a bundle name, highlight all channels in the bundle */
-                       
+
                        list<PortMatrixNode> n;
-                       
-                       for (uint32_t i = 0; i < w.bundle->nchannels(); ++i) {
+
+                       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 (bc, ARDOUR::BundleChannel ()));
                        }
-                       
+
                        _body->set_mouseover (n);
                        done = true;
-                       
+
                } else if (x < _width) {
-                       
+
                        _body->set_mouseover (PortMatrixNode (w, ARDOUR::BundleChannel ()));
                        done = true;
-                       
+
                }
 
        }