diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-19 13:14:26 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-26 18:22:22 +0200 |
| commit | 318a9edab99606d7fbf7eb21d816c7416c76b894 (patch) | |
| tree | 52fbbb2c7e898bdc0369b9acf40e4cbee2618685 /gtk2_ardour/button_joiner.cc | |
| parent | e9768e934fdeaf31aaae779e42ff493a2e781179 (diff) | |
massive reworking of color selection implementation
Diffstat (limited to 'gtk2_ardour/button_joiner.cc')
| -rw-r--r-- | gtk2_ardour/button_joiner.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc index 0c60cba1db..da9ae45847 100644 --- a/gtk2_ardour/button_joiner.cc +++ b/gtk2_ardour/button_joiner.cc @@ -74,7 +74,7 @@ ButtonJoiner::ButtonJoiner (const std::string& str, Gtk::Widget& lw, Gtk::Widget uint32_t border_color; uint32_t r, g, b, a; - border_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", name)); + border_color = ARDOUR_UI::config()->color (string_compose ("%1: border end", name)); UINT_TO_RGBA (border_color, &r, &g, &b, &a); border_r = r/255.0; @@ -256,15 +256,15 @@ ButtonJoiner::set_colors () active_fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()); inactive_fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()); - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", name)); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", name)); + start_color = ARDOUR_UI::config()->color (string_compose ("%1: fill start", name)); + end_color = ARDOUR_UI::config()->color (string_compose ("%1: fill end", name)); UINT_TO_RGBA (start_color, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgba (inactive_fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0); UINT_TO_RGBA (end_color, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgba (inactive_fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0); - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", name)); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", name)); + start_color = ARDOUR_UI::config()->color (string_compose ("%1: fill start active", name)); + end_color = ARDOUR_UI::config()->color (string_compose ("%1: fill end active", name)); UINT_TO_RGBA (start_color, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgba (active_fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0); UINT_TO_RGBA (end_color, &r, &g, &b, &a); |