From c881b4a85f77588b98ce0dc01bca86e8ff4ece89 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 12 Feb 2019 11:30:31 -0600 Subject: [PATCH] Summary View should use the playhead color from config. --- gtk2_ardour/editor_summary.cc | 17 +++++++++++++++-- gtk2_ardour/editor_summary.h | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index e7355b577c..4ca37d191d 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -118,6 +118,10 @@ EditorSummary::set_session (Session* s) _editor->selection->RegionsChanged.connect (sigc::mem_fun(*this, &EditorSummary::set_background_dirty)); } + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &EditorSummary::set_colors)); + + set_colors(); + _leftmost = max_samplepos; _rightmost = 0; } @@ -286,8 +290,9 @@ EditorSummary::render (Cairo::RefPtr const& ctx, cairo_rectangle /* Playhead */ cairo_set_line_width (cr, 1); - /* XXX: colour should be set from configuration file */ - cairo_set_source_rgba (cr, 1, 0, 0, 1); + + double r,g,b,a; Gtkmm2ext::color_to_rgba(_phead_color, r,g,b,a); + cairo_set_source_rgb (cr, r,g,b); // playhead color const double ph= playhead_sample_to_position (_editor->playhead_cursor->current_sample()); cairo_move_to (cr, ph, 0); @@ -299,6 +304,14 @@ EditorSummary::render (Cairo::RefPtr const& ctx, cairo_rectangle } +void +EditorSummary::set_colors () +{ + _phead_color = UIConfiguration::instance().color ("play head"); +} + + + /** Render a region for the summary. * @param r Region view. * @param cr Cairo context. diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h index 507295cfff..077dab3a4c 100644 --- a/gtk2_ardour/editor_summary.h +++ b/gtk2_ardour/editor_summary.h @@ -105,6 +105,9 @@ private: bool _move_dragging; + void set_colors (); + uint32_t _phead_color; + //used for zooming int _last_mx; int _last_my;