allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

ui: button: themable outline color instead of hard-coded black

Browse Source
This commit is contained in:
jean-emmanuel
2023-12-08 16:24:24 +01:00
parent 83c23f5f26
commit 08ad1af9dc
11 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/themes/blueberry_milk-ardour.colors
View File

@@ -111,6 +111,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/caineville-ardour.colors
View File

@@ -112,6 +112,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/clear_gray-ardour.colors
View File

@@ -112,6 +112,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="neutral:foreground2"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/cubasish-ardour.colors
View File

@@ -112,6 +112,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="neutral:foreground2"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/dark-ardour.colors
View File

@@ -114,6 +114,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/diehard3-ardour.colors
View File

@@ -113,6 +113,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/recbox-ardour.colors
View File

@@ -113,6 +113,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="neutral:background"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/unastudia-ardour.colors
View File

@@ -111,6 +111,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:blue"/>
<ColorAlias name="generic button: outline" alias="neutral:background"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:background"/>

1
gtk2_ardour/themes/xcolors-ardour.colors
View File

@@ -112,6 +112,7 @@
<ColorAlias name="generic button: fill" alias="widget:bg"/>
<ColorAlias name="generic button: fill active" alias="alert:red"/>
<ColorAlias name="generic button: led active" alias="alert:green"/>
<ColorAlias name="generic button: outline" alias="theme:bg2"/>
<ColorAlias name="ghost track base" alias="neutral:background2"/>
<ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
<ColorAlias name="ghost track wave" alias="neutral:midground"/>

6
libs/widgets/ardour_button.cc
View File

@@ -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<Cairo::Context> 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.
*/

3
libs/widgets/widgets/ardour_button.h
View File

@@ -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;