*/
#include <iostream>
+#include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h"
-#include "ardour/types.h"
+#include "gtkmm2ext/colors.h"
+#include "utils.h"
#include "port_matrix_column_labels.h"
#include "port_matrix.h"
#include "port_matrix_body.h"
-#include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
void
PortMatrixColumnLabels::compute_dimensions ()
{
- GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, 24);
- gdk_drawable_set_colormap (pm, gdk_colormap_get_system());
- cairo_t* cr = gdk_cairo_create (pm);
+ cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 200, 200);
+ cairo_t* cr = cairo_create (surface);
/* width of the longest bundle name */
_longest_bundle_name = 0;
}
cairo_destroy (cr);
- g_object_unref (pm);
+ cairo_surface_destroy (surface);
/* height of the whole thing */
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;
}
for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) {
- for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
+ uint32_t const C = _matrix->count_of_our_type ((*i)->bundle->nchannels ());
- if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
- continue;
- }
-
+ for (uint32_t j = 0; j < C; ++j) {
Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N);
- render_channel_name (cr, background_colour (), c, x, 0, ARDOUR::BundleChannel ((*i)->bundle, j));
+
+ ARDOUR::BundleChannel bc (
+ (*i)->bundle,
+ (*i)->bundle->type_channel_to_overall (_matrix->type (), j)
+ );
+
+ render_channel_name (cr, background_colour (), c, x, 0, bc);
x += grid_spacing();
}
-
+
+ if (C == 0) {
+ x += grid_spacing ();
+ }
+
++N;
}
}
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);
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;
cairo_set_line_width (cr, label_border_width());
cairo_stroke (cr);
- set_source_rgb (cr, text_colour());
+ Gdk::Color textcolor;
+ ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+ set_source_rgb (cr, textcolor);
double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
cairo_set_line_width (cr, label_border_width());
cairo_stroke (cr);
- set_source_rgb (cr, text_colour());
+ Gdk::Color textcolor;
+ ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+ set_source_rgb (cr, textcolor);
double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
xoff + grid_spacing() - q * sin (angle ()),
yoff + _height - q * cos (angle ())
);
-
+
} else {
/* only plot the name if the bundle has more than one channel;
the name of a single channel is assumed to be redundant */
-
+
cairo_save (cr);
cairo_rotate (cr, -angle());
-
+
cairo_show_text (
cr,
bc.bundle->channel_name(bc.channel).c_str()
);
-
+
cairo_restore (cr);
}
}
}
void
-PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixColumnLabels::button_press (double x, double y, GdkEventButton* ev)
{
ARDOUR::BundleChannel w = position_to_channel (x, y, _matrix->visible_columns());
w.channel = -1;
}
- if (b == 3) {
+ if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) {
+ _matrix->remove_channel (w);
+ } else if (ev->button == 3) {
_matrix->popup_menu (
w,
ARDOUR::BundleChannel (),
- t
+ ev->time
);
}
}
) {
/* 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().n_total(); ++i) {
-
- if (!_matrix->should_show (w.bundle->channel_type(i))) {
+ if (!_matrix->should_show (w.bundle->channel_type (i))) {
continue;
}
-
+
ARDOUR::BundleChannel const bc (w.bundle, i);
n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
}
_body->set_mouseover (n);
} else {
-
+
_body->set_mouseover (PortMatrixNode (ARDOUR::BundleChannel (), w));
}
-}
+}