#include <iostream>
#include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h"
+#include "canvas/colors.h"
+#include "utils.h"
#include "port_matrix_row_labels.h"
#include "port_matrix.h"
#include "port_matrix_body.h"
#include "i18n.h"
-#include "utils.h"
using namespace std;
void
PortMatrixRowLabels::compute_dimensions ()
{
- GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, gdk_visual_get_depth (gdk_visual_get_system ()));
- 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);
_longest_port_name = 0;
_longest_bundle_name = 0;
}
cairo_destroy (cr);
- g_object_unref (pm);
+ cairo_surface_destroy (surface);
_width = _longest_bundle_name +
name_pad() * 2;
uint32_t const N = _matrix->count_of_our_type ((*i)->bundle->nchannels());
for (uint32_t j = 0; j < N; ++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));
+ ARDOUR::BundleChannel bc (
+ (*i)->bundle,
+ (*i)->bundle->type_channel_to_overall (_matrix->type (), j)
+ );
+
+ render_channel_name (cr, background_colour (), c, 0, y, bc);
y += grid_spacing();
++M;
}
if (N == 0) {
y += grid_spacing ();
}
-
+
} else {
y += grid_spacing();
}
}
void
-PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev)
{
ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
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 (
ARDOUR::BundleChannel (),
w,
- t
+ ev->time
);
}
}
cairo_text_extents (cr, b->name().c_str(), &ext);
double const off = (grid_spacing() - ext.height) / 2;
- set_source_rgb (cr, text_colour());
+ Gdk::Color textcolor;
+ ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+ set_source_rgb (cr, textcolor);
cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off);
cairo_show_text (cr, b->name().c_str());
}
cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext);
double const off = (grid_spacing() - ext.height) / 2;
- set_source_rgb (cr, text_colour());
+ Gdk::Color textcolor;
+ ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+ set_source_rgb (cr, textcolor);
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());
}
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;
}