From a5efe1a1eeae14b0893489c7676fdd699257bd64 Mon Sep 17 00:00:00 2001 From: jean-emmanuel Date: Fri, 8 Dec 2023 16:44:08 +0100 Subject: [PATCH] ui: fader: themable outline color instead of hard-coded black (use same theme color as button outline) --- libs/widgets/ardour_fader.cc | 8 +++++++- libs/widgets/widgets/ardour_fader.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/widgets/ardour_fader.cc b/libs/widgets/ardour_fader.cc index bf6478b9b9..32470dda05 100644 --- a/libs/widgets/ardour_fader.cc +++ b/libs/widgets/ardour_fader.cc @@ -29,6 +29,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/ardour_fader.h" +#include "widgets/ui_config.h" using namespace Gtk; using namespace std; @@ -60,6 +61,7 @@ ArdourFader::ArdourFader (Gtk::Adjustment& adj, int orientation, int fader_lengt , _current_parent (0) , have_explicit_bg (false) , have_explicit_fg (false) + , outline_color (0) { _default_value = _adjustment.get_value(); update_unity_position (); @@ -81,6 +83,9 @@ ArdourFader::ArdourFader (Gtk::Adjustment& adj, int orientation, int fader_lengt } else { CairoWidget::set_size_request(_span, _girth); } + + outline_color = UIConfigurationBase::instance().color ("generic button: outline"); + } ArdourFader::~ArdourFader () @@ -280,7 +285,8 @@ ArdourFader::render (Cairo::RefPtr const& ctx, cairo_rectangle_t cairo_fill(cr); cairo_set_line_width (cr, 2); - cairo_set_source_rgba (cr, 0, 0, 0, 1.0); + Gtkmm2ext::set_source_rgba (cr, outline_color); + cairo_matrix_t matrix; Gtkmm2ext::rounded_rectangle (cr, CORNER_OFFSET, CORNER_OFFSET, w-CORNER_SIZE, h-CORNER_SIZE, CORNER_RADIUS); diff --git a/libs/widgets/widgets/ardour_fader.h b/libs/widgets/widgets/ardour_fader.h index 5da24394fb..1cd16f9942 100644 --- a/libs/widgets/widgets/ardour_fader.h +++ b/libs/widgets/widgets/ardour_fader.h @@ -110,6 +110,8 @@ private: Gtkmm2ext::Color explicit_fg; bool have_explicit_fg; + uint32_t outline_color; + void create_patterns(); void adjustment_changed (); void set_adjustment_from_event (GdkEventButton *);