make rulers color-sensitive (e.g. theme manager editable, etc)

This commit is contained in:
Paul Davis
2014-06-12 01:06:25 -04:00
parent e1825361b5
commit 79c30ab766
2 changed files with 14 additions and 2 deletions

View File

@@ -470,7 +470,6 @@ Editor::Editor ()
transport_mark_label.set_no_show_all();
initialize_canvas ();
initialize_rulers ();
_summary = new EditorSummary (this);

View File

@@ -266,6 +266,8 @@ Editor::initialize_canvas ()
_track_canvas_viewport->signal_size_allocate().connect (sigc::mem_fun(*this, &Editor::track_canvas_viewport_allocate));
initialize_rulers ();
ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler));
color_handler();
@@ -597,7 +599,7 @@ Editor::autoscroll_canvas ()
if (autoscroll_vertical_allowed) {
const double vertical_pos = vertical_adjustment.get_value();
// const double vertical_pos = vertical_adjustment.get_value();
const int speed_factor = 20;
/* vertical */
@@ -811,6 +813,17 @@ Editor::set_horizontal_position (double p)
void
Editor::color_handler()
{
ArdourCanvas::Color base = ARDOUR_UI::config()->get_canvasvar_RulerBase();
ArdourCanvas::Color text = ARDOUR_UI::config()->get_canvasvar_RulerText();
timecode_ruler->set_fill_color (base);
timecode_ruler->set_outline_color (text);
minsec_ruler->set_fill_color (base);
minsec_ruler->set_outline_color (text);
samples_ruler->set_fill_color (base);
samples_ruler->set_outline_color (text);
bbt_ruler->set_fill_color (base);
bbt_ruler->set_outline_color (text);
playhead_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_PlayHead());
_verbose_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());