diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-11 17:03:52 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-11 17:03:52 -0500 |
| commit | bd430c2080e24e624495858552c217d7bc9101a6 (patch) | |
| tree | fea511ff10fe85714b2fb8dedbbcc071c35a0d80 /gtk2_ardour/ui_config.cc | |
| parent | 9278ae23c4e048093231ec8ac44da72b07684ec7 (diff) | |
allow UIConfiguration::color() to tell caller that it could not find the named color
Diffstat (limited to 'gtk2_ardour/ui_config.cc')
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 127654990f..22ac72d240 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -634,10 +634,14 @@ UIConfiguration::base_color_by_name (const std::string& name) const } ArdourCanvas::Color -UIConfiguration::color (const std::string& name) const +UIConfiguration::color (const std::string& name, bool* failed) const { map<string,string>::const_iterator e = color_aliases.find (name); + if (failed) { + *failed = false; + } + if (e != color_aliases.end ()) { map<string,RelativeHSV>::const_iterator rc = relative_colors.find (e->second); if (rc != relative_colors.end()) { @@ -652,6 +656,10 @@ UIConfiguration::color (const std::string& name) const } cerr << string_compose (_("Color %1 not found"), name) << endl; + + if (failed) { + *failed = true; + } return rgba_to_color ((g_random_int()%256)/255.0, (g_random_int()%256)/255.0, |