13
0

ui: correctly implement themable button outline color

This commit is contained in:
jean-emmanuel 2023-12-13 18:38:46 +01:00
parent feed0008bc
commit f8a2c847b5

View File

@ -783,13 +783,18 @@ ArdourButton::set_colors ()
{ {
_update_colors = false; _update_colors = false;
std::string name = get_name();
bool failed = false;
outline_color = UIConfigurationBase::instance().color (string_compose ("%1: outline", name), &failed);
if (failed) {
outline_color = UIConfigurationBase::instance().color ("generic button: outline");
}
if (_fixed_colors_set == 0x3) { if (_fixed_colors_set == 0x3) {
return; return;
} }
std::string name = get_name();
bool failed = false;
if (!(_fixed_colors_set & 0x1)) { if (!(_fixed_colors_set & 0x1)) {
fill_active_color = UIConfigurationBase::instance().color (string_compose ("%1: fill active", name), &failed); fill_active_color = UIConfigurationBase::instance().color (string_compose ("%1: fill active", name), &failed);
if (failed) { if (failed) {
@ -812,9 +817,6 @@ ArdourButton::set_colors ()
led_active_color = UIConfigurationBase::instance().color ("generic button: led active"); 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 /* The inactive color for the LED is just a fairly dark version of the
* active color. * active color.
*/ */