fall back on "generic button" colors in ArdourButton if specifically named fills + LED colors are not defined

This commit is contained in:
Paul Davis 2014-12-11 17:04:21 -05:00
parent bd430c2080
commit 75e6a36d8e

View File

@ -662,15 +662,28 @@ ArdourButton::set_colors ()
return;
}
std::string name = get_name();
bool failed = false;
fill_active_color = ARDOUR_UI::config()->color (string_compose ("%1: fill active", name));
fill_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: fill", name));
fill_active_color = ARDOUR_UI::config()->color (string_compose ("%1: fill active", name), &failed);
if (failed) {
fill_active_color = ARDOUR_UI::config()->color ("generic button: fill active");
}
fill_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: fill", name), &failed);
if (failed) {
fill_inactive_color = ARDOUR_UI::config()->color ("generic button: fill");
}
text_active_color = ArdourCanvas::contrasting_text_color (fill_active_color);
text_inactive_color = ArdourCanvas::contrasting_text_color (fill_inactive_color);
led_active_color = ARDOUR_UI::config()->color (string_compose ("%1: led active", name));
led_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: led", name));
led_active_color = ARDOUR_UI::config()->color (string_compose ("%1: led active", name), &failed);
if (failed) {
led_active_color = ARDOUR_UI::config()->color ("generic button: led active");
}
led_inactive_color = ARDOUR_UI::config()->color (string_compose ("%1: led", name), &failed);
if (failed) {
led_inactive_color = ARDOUR_UI::config()->color ("generic button: led");
}
}
/**