ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

improve port-matrix text contrast

Browse Source
This commit is contained in:
Robin Gareus 2015-03-14 22:58:40 +01:00
parent b6eeeaa95b
commit 7679f7802b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/port_matrix_column_labels.cc
View File

@ -20,6 +20,8 @@
#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"
@ -291,7 +293,9 @@ PortMatrixColumnLabels::render_bundle_name (
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;
@ -343,7 +347,9 @@ PortMatrixColumnLabels::render_channel_name (
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;

10
gtk2_ardour/port_matrix_row_labels.cc
View File

@ -22,6 +22,8 @@
#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"
@ -233,7 +235,9 @@ PortMatrixRowLabels::render_bundle_name (
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());
}
@ -259,7 +263,9 @@ 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;
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());
}