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/ui_config.h | |
| 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/ui_config.h')
| -rw-r--r-- | gtk2_ardour/ui_config.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 159884a14f..4b7de631d6 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -34,7 +34,7 @@ #include "pbd/xml++.h" #include "pbd/configuration_variable.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #include "widgets/ui_config.h" #include "utils.h" @@ -64,29 +64,29 @@ public: std::string color_file_name (bool use_my, bool with_version) const; - typedef std::map<std::string,ArdourCanvas::Color> Colors; + typedef std::map<std::string,Gtkmm2ext::Color> Colors; typedef std::map<std::string,std::string> ColorAliases; - typedef std::map<std::string,ArdourCanvas::SVAModifier> Modifiers; + typedef std::map<std::string,Gtkmm2ext::SVAModifier> Modifiers; Colors colors; ColorAliases color_aliases; Modifiers modifiers; void set_alias (std::string const & name, std::string const & alias); - void set_color (const std::string& name, ArdourCanvas::Color); - void set_modifier (std::string const &, ArdourCanvas::SVAModifier svam); + void set_color (const std::string& name, Gtkmm2ext::Color); + void set_modifier (std::string const &, Gtkmm2ext::SVAModifier svam); - std::string color_as_alias (ArdourCanvas::Color c); - ArdourCanvas::Color quantized (ArdourCanvas::Color) const; + std::string color_as_alias (Gtkmm2ext::Color c); + Gtkmm2ext::Color quantized (Gtkmm2ext::Color) const; - ArdourCanvas::Color color (const std::string&, bool* failed = 0) const; - ArdourCanvas::Color color_mod (std::string const & color, std::string const & modifier) const; - ArdourCanvas::Color color_mod (const ArdourCanvas::Color& color, std::string const & modifier) const; - ArdourCanvas::HSV color_hsv (const std::string&) const; - ArdourCanvas::SVAModifier modifier (const std::string&) const; + Gtkmm2ext::Color color (const std::string&, bool* failed = 0) const; + Gtkmm2ext::Color color_mod (std::string const & color, std::string const & modifier) const; + Gtkmm2ext::Color color_mod (const Gtkmm2ext::Color& color, std::string const & modifier) const; + Gtkmm2ext::HSV color_hsv (const std::string&) const; + Gtkmm2ext::SVAModifier modifier (const std::string&) const; - static std::string color_to_hex_string (ArdourCanvas::Color c); - static std::string color_to_hex_string_no_alpha (ArdourCanvas::Color c); + static std::string color_to_hex_string (Gtkmm2ext::Color c); + static std::string color_to_hex_string_no_alpha (Gtkmm2ext::Color c); void reset_dpi (); float get_ui_scale (); |