projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
gtk2_ardour
/
port_matrix_column_labels.cc
diff --git
a/gtk2_ardour/port_matrix_column_labels.cc
b/gtk2_ardour/port_matrix_column_labels.cc
index 1f5a21feec22daa38a9cef20161ce1340ca1522d..4cf12b58b3fce1c89f4d7fc3ccc6ca1825c467ee 100644
(file)
--- a/
gtk2_ardour/port_matrix_column_labels.cc
+++ b/
gtk2_ardour/port_matrix_column_labels.cc
@@
-20,12
+20,13
@@
#include <iostream>
#include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h"
#include <iostream>
#include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h"
+#include "canvas/colors.h"
+#include "utils.h"
#include "port_matrix_column_labels.h"
#include "port_matrix.h"
#include "port_matrix_body.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;
using namespace std;
@@
-161,7
+162,7
@@
PortMatrixColumnLabels::render (cairo_t* cr)
(*i)->bundle,
(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
);
(*i)->bundle,
(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
);
-
+
render_channel_name (cr, background_colour (), c, x, 0, bc);
x += grid_spacing();
}
render_channel_name (cr, background_colour (), c, x, 0, bc);
x += grid_spacing();
}
@@
-292,7
+293,9
@@
PortMatrixColumnLabels::render_bundle_name (
cairo_set_line_width (cr, label_border_width());
cairo_stroke (cr);
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, ArdourCanvas::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;
double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
@@
-344,7
+347,9
@@
PortMatrixColumnLabels::render_channel_name (
cairo_set_line_width (cr, label_border_width());
cairo_stroke (cr);
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, ArdourCanvas::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;
double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height;
@@
-499,7
+504,7
@@
PortMatrixColumnLabels::motion (double x, double y)
if (!_matrix->should_show (w.bundle->channel_type (i))) {
continue;
}
if (!_matrix->should_show (w.bundle->channel_type (i))) {
continue;
}
-
+
ARDOUR::BundleChannel const bc (w.bundle, i);
n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
}
ARDOUR::BundleChannel const bc (w.bundle, i);
n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
}