diff options
| author | Robin Gareus <robin@gareus.org> | 2017-07-17 18:34:35 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
| commit | 601c317d70a03190257577bd867cefc2c70d3275 (patch) | |
| tree | 077071290f084431a912414c4e87b6127c586677 /gtk2_ardour/color_theme_manager.cc | |
| parent | 1f5ebc54853446a786925941bd014666e75221d2 (diff) | |
Clean up library inheritance (colors.h, utils.h)
make libwidget independent of libcanvas.
Confine basics to pbd and gtkmm2ext.
Diffstat (limited to 'gtk2_ardour/color_theme_manager.cc')
| -rw-r--r-- | gtk2_ardour/color_theme_manager.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index 634db8e1c4..f43d8ff2de 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/gtk2_ardour/color_theme_manager.cc @@ -53,6 +53,7 @@ using namespace std; using namespace Gtk; using namespace PBD; using namespace ARDOUR; +using namespace Gtkmm2ext; using namespace ARDOUR_UI_UTILS; ColorThemeManager::ColorThemeManager () @@ -273,8 +274,8 @@ ColorThemeManager::palette_canvas_allocated (Gtk::Allocation& alloc, ArdourCanva struct NamedColor { string name; - ArdourCanvas::HSV color; - NamedColor (string s, ArdourCanvas::HSV c) : name (s), color (c) {} + Gtkmm2ext::HSV color; + NamedColor (string s, Gtkmm2ext::HSV c) : name (s), color (c) {} }; struct SortByHue { @@ -378,7 +379,7 @@ ColorThemeManager::edit_palette_color (std::string name) using namespace ArdourCanvas; double r,g, b, a; UIConfiguration* uic (&UIConfiguration::instance()); - ArdourCanvas::Color c = uic->color (name); + Gtkmm2ext::Color c = uic->color (name); Gdk::Color gdkcolor; color_to_rgba (c, r, g, b, a); |