diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors index 6063e73bdc..bad14e9d4c 100644 --- a/gtk2_ardour/themes/blueberry_milk-ardour.colors +++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors @@ -111,6 +111,7 @@ + diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index 77c0b81842..874b3985bf 100644 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -112,6 +112,7 @@ + diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors index df540c7e20..0fd36e6eeb 100644 --- a/gtk2_ardour/themes/clear_gray-ardour.colors +++ b/gtk2_ardour/themes/clear_gray-ardour.colors @@ -112,6 +112,7 @@ + diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index 457595952c..b85fd0f8a1 100644 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -112,6 +112,7 @@ + diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 130332890a..9feec630de 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -114,6 +114,7 @@ + diff --git a/gtk2_ardour/themes/diehard3-ardour.colors b/gtk2_ardour/themes/diehard3-ardour.colors index 99b17b545d..1c3415a441 100644 --- a/gtk2_ardour/themes/diehard3-ardour.colors +++ b/gtk2_ardour/themes/diehard3-ardour.colors @@ -113,6 +113,7 @@ + diff --git a/gtk2_ardour/themes/recbox-ardour.colors b/gtk2_ardour/themes/recbox-ardour.colors index 6e01cd2af4..2f9855934d 100644 --- a/gtk2_ardour/themes/recbox-ardour.colors +++ b/gtk2_ardour/themes/recbox-ardour.colors @@ -113,6 +113,7 @@ + diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index ac48d4fa2d..c667fbe93a 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -111,6 +111,7 @@ + diff --git a/gtk2_ardour/themes/xcolors-ardour.colors b/gtk2_ardour/themes/xcolors-ardour.colors index b4cf0f4902..8e1c3e4761 100644 --- a/gtk2_ardour/themes/xcolors-ardour.colors +++ b/gtk2_ardour/themes/xcolors-ardour.colors @@ -112,6 +112,7 @@ + diff --git a/libs/widgets/ardour_button.cc b/libs/widgets/ardour_button.cc index 6848ad1c0e..7cd6386ed2 100644 --- a/libs/widgets/ardour_button.cc +++ b/libs/widgets/ardour_button.cc @@ -130,6 +130,7 @@ ArdourButton::ArdourButton (const std::string& str, Element e, bool toggle) , led_inactive_color(0) , led_custom_color (0) , use_custom_led_color (false) + , outline_color (0) , convex_pattern (0) , concave_pattern (0) , led_inset_pattern (0) @@ -320,7 +321,7 @@ ArdourButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_ // draw edge (filling a rect underneath, rather than stroking a border on top, allows the corners to be lighter-weight. if ((_elements & (Body|Edge)) == (Body|Edge)) { rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5); - cairo_set_source_rgba (cr, 0, 0, 0, 1); + Gtkmm2ext::set_source_rgba (cr, outline_color); cairo_fill(cr); } @@ -811,6 +812,9 @@ ArdourButton::set_colors () led_active_color = UIConfigurationBase::instance().color ("generic button: led active"); } + outline_color = UIConfigurationBase::instance().color ("generic button: outline"); + + /* The inactive color for the LED is just a fairly dark version of the * active color. */ diff --git a/libs/widgets/widgets/ardour_button.h b/libs/widgets/widgets/ardour_button.h index 71c8fdcf85..593a801939 100644 --- a/libs/widgets/widgets/ardour_button.h +++ b/libs/widgets/widgets/ardour_button.h @@ -195,6 +195,9 @@ class LIBWIDGETS_API ArdourButton : public CairoWidget , public Gtkmm2ext::Activ uint32_t led_custom_color; bool use_custom_led_color; + uint32_t outline_color; + + cairo_pattern_t* convex_pattern; cairo_pattern_t* concave_pattern; cairo_pattern_t* led_inset_pattern;